summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/l2cap_sock.c
diff options
context:
space:
mode:
authorJaganath Kanakkassery <jaganath.k@samsung.com>2012-07-13 18:17:55 +0530
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-08-06 15:02:58 -0300
commit4af66c691f4e5c2db9bb00793669a548e9db1974 (patch)
tree2ea27d4467c635d78d5b001ee4bee384b1ab7eea /net/bluetooth/l2cap_sock.c
parent3064837289259843310b266a9422aca5f5b4b9c7 (diff)
downloadblackbird-op-linux-4af66c691f4e5c2db9bb00793669a548e9db1974.tar.gz
blackbird-op-linux-4af66c691f4e5c2db9bb00793669a548e9db1974.zip
Bluetooth: Free the l2cap channel list only when refcount is zero
Move the l2cap channel list chan->global_l under the refcnt protection and free it based on the refcnt. Signed-off-by: Jaganath Kanakkassery <jaganath.k@samsung.com> Signed-off-by: Syam Sidhardhan <s.syam@samsung.com> Reviewed-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth/l2cap_sock.c')
-rw-r--r--net/bluetooth/l2cap_sock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index a4bb27e8427e..79350d10087c 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -823,7 +823,7 @@ static void l2cap_sock_kill(struct sock *sk)
/* Kill poor orphan */
- l2cap_chan_destroy(l2cap_pi(sk)->chan);
+ l2cap_chan_put(l2cap_pi(sk)->chan);
sock_set_flag(sk, SOCK_DEAD);
sock_put(sk);
}
OpenPOWER on IntegriCloud