summaryrefslogtreecommitdiff
path: root/net/bluetooth
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2011-06-17 12:57:25 -0300
committerGustavo F. Padovan <padovan@profusion.mobi>2011-07-01 16:10:06 -0300
commit2461daacb3e2ecca5edea2fa637a1b0922e86515 (patch)
tree147323bed88ad2a5b74144f1c448606be045b670 /net/bluetooth
parent2d25f8b462f3b849d8913d02978657ef06e67dd8 (diff)
downloadlinux-3.10-2461daacb3e2ecca5edea2fa637a1b0922e86515.tar.gz
linux-3.10-2461daacb3e2ecca5edea2fa637a1b0922e86515.tar.bz2
linux-3.10-2461daacb3e2ecca5edea2fa637a1b0922e86515.zip
Bluetooth: Fix bad locking balance
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/l2cap_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index becf2ad7220..27b2cd124f0 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -741,9 +741,9 @@ static void l2cap_conn_start(struct l2cap_conn *conn)
&chan->conf_state)) {
/* l2cap_chan_close() calls list_del(chan)
* so release the lock */
- read_unlock_bh(&conn->chan_lock);
+ read_unlock(&conn->chan_lock);
l2cap_chan_close(chan, ECONNRESET);
- read_lock_bh(&conn->chan_lock);
+ read_lock(&conn->chan_lock);
bh_unlock_sock(sk);
continue;
}