From: Andrei Emeltchenko <andrei.emeltchenko@nokia.com>
Date: Tue, 15 Dec 2009 09:38:04 +0000 (+0200)
Subject: Bluetooth: Fix L2CAP locking scheme regression
X-Git-Tag: v2.6.33-rc2~40^2~16
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b13f5860447a98daf0358a51fbff66154ac0663a;p=~emulex%2Finfiniband.git

Bluetooth: Fix L2CAP locking scheme regression

When locking was introduced the error path branch was not taken
into account. Error was found in sparse code checking. Kudos to
Jani Nikula.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@nokia.com>
Acked-by: Gustavo F. Padovan <gustavo@las.ic.unicamp.br>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index fb0f81d99f9..1120cf14a54 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -1212,6 +1212,7 @@ static void l2cap_monitor_timeout(unsigned long arg)
 	bh_lock_sock(sk);
 	if (l2cap_pi(sk)->retry_count >= l2cap_pi(sk)->remote_max_tx) {
 		l2cap_send_disconn_req(l2cap_pi(sk)->conn, sk);
+		bh_unlock_sock(sk);
 		return;
 	}