diff options
author | Andrei Emeltchenko <andrei.emeltchenko@nokia.com> | 2009-12-15 04:38:04 -0500 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2009-12-17 15:07:25 -0500 |
commit | b13f5860447a98daf0358a51fbff66154ac0663a (patch) | |
tree | fc4c752e4b8ab5649d421955de3de399953f12d9 /net | |
parent | 186ee8cf0130993dea8ab8867ff1af8a148f9ae6 (diff) |
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>
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/l2cap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index fb0f81d99f96..1120cf14a548 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c | |||
@@ -1212,6 +1212,7 @@ static void l2cap_monitor_timeout(unsigned long arg) | |||
1212 | bh_lock_sock(sk); | 1212 | bh_lock_sock(sk); |
1213 | if (l2cap_pi(sk)->retry_count >= l2cap_pi(sk)->remote_max_tx) { | 1213 | if (l2cap_pi(sk)->retry_count >= l2cap_pi(sk)->remote_max_tx) { |
1214 | l2cap_send_disconn_req(l2cap_pi(sk)->conn, sk); | 1214 | l2cap_send_disconn_req(l2cap_pi(sk)->conn, sk); |
1215 | bh_unlock_sock(sk); | ||
1215 | return; | 1216 | return; |
1216 | } | 1217 | } |
1217 | 1218 | ||