diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-06-03 22:31:50 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-03 22:31:50 +0400 |
| commit | 7b29dc21ea084be7ddfb536994a9cfae95337690 (patch) | |
| tree | 799f5becd9484e53e09b5f620ebfd5315bdfe033 /net/bluetooth/l2cap_core.c | |
| parent | 9a2e0fb0893ddf595d0a372e681f5b98017c6d90 (diff) | |
| parent | dfe21582ac5ebc460dda98c67e8589dd506d02cd (diff) | |
| download | linux-7b29dc21ea084be7ddfb536994a9cfae95337690.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index a86f9ba4f05c..e64a1c2df238 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -906,7 +906,7 @@ static struct l2cap_chan *l2cap_global_chan_by_psm(int state, __le16 psm, bdaddr if (c->psm == psm) { /* Exact match. */ if (!bacmp(&bt_sk(sk)->src, src)) { - read_unlock_bh(&chan_list_lock); + read_unlock(&chan_list_lock); return c; } |