From: Gustavo F. Padovan <padovan@profusion.mobi>
Date: Fri, 17 Jun 2011 15:57:25 +0000 (-0300)
Subject: Bluetooth: Fix bad locking balance
X-Git-Tag: v3.1-rc1~316^2~124^2^2~58^2~25
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2461daacb3e2ecca5edea2fa637a1b0922e86515;p=~emulex%2Finfiniband.git

Bluetooth: Fix bad locking balance

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
---

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;
 			}