From 0c066803d720cc883e9db677460b2c3ec958c6be Mon Sep 17 00:00:00 2001 From: Jaganath Kanakkassery Date: Thu, 19 Jul 2012 12:54:04 +0530 Subject: [PATCH] --- yaml --- r: 321997 b: refs/heads/master c: 49dfbb9129c4edb318578de35cc45c555df37884 h: refs/heads/master i: 321995: 2721751b09a8049dcf4181f15035f57cb7d9ce67 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/l2cap_sock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3803e87a6ad1..74157a58669a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d08fd0e712a834d4abb869c0215a702e290bc51e +refs/heads/master: 49dfbb9129c4edb318578de35cc45c555df37884 diff --git a/trunk/net/bluetooth/l2cap_sock.c b/trunk/net/bluetooth/l2cap_sock.c index a4bb27e8427e..b94abd30e6f9 100644 --- a/trunk/net/bluetooth/l2cap_sock.c +++ b/trunk/net/bluetooth/l2cap_sock.c @@ -1174,7 +1174,7 @@ static struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock, int p chan = l2cap_chan_create(); if (!chan) { - l2cap_sock_kill(sk); + sk_free(sk); return NULL; }