From 3474d419d4fef3f7dbb9dbbacd51e6e2b36527e6 Mon Sep 17 00:00:00 2001 From: "Gustavo F. Padovan" Date: Wed, 13 Apr 2011 19:01:22 -0300 Subject: [PATCH] --- yaml --- r: 246935 b: refs/heads/master c: 280f294f7bd0c14d9f802a551c95dc930e31d723 h: refs/heads/master i: 246933: 41e8f4f873ba57e63e0772d342240c0c252018ef 246931: 192aa36102c8bfb28c89099df11934408409c329 246927: 583dbe30f8c463c51dc77e017654cd0d698da6aa v: v3 --- [refs] | 2 +- trunk/net/bluetooth/l2cap_core.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b217236d116f..815313ff7c1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f72c1d977e47a7d182d49ea131067cba0a96ab8 +refs/heads/master: 280f294f7bd0c14d9f802a551c95dc930e31d723 diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c index c9c1f9257a91..d5db5a38df6a 100644 --- a/trunk/net/bluetooth/l2cap_core.c +++ b/trunk/net/bluetooth/l2cap_core.c @@ -594,7 +594,7 @@ static void l2cap_conn_start(struct l2cap_conn *conn) */ static struct sock *l2cap_get_sock_by_scid(int state, __le16 cid, bdaddr_t *src) { - struct sock *s, *sk = NULL, *sk1 = NULL; + struct sock *sk = NULL, *sk1 = NULL; struct hlist_node *node; read_lock(&l2cap_sk_list.lock); @@ -613,12 +613,10 @@ static struct sock *l2cap_get_sock_by_scid(int state, __le16 cid, bdaddr_t *src) sk1 = sk; } } - s = node ? sk : sk1; - if (s) - bh_lock_sock(s); + read_unlock(&l2cap_sk_list.lock); - return s; + return node ? sk : sk1; } static void l2cap_le_conn_ready(struct l2cap_conn *conn)