diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-08-10 14:41:38 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-08-10 14:41:38 -0400 |
| commit | bbf2e65258302c42d74fd53b3d92d6d8f03aaeff (patch) | |
| tree | ea5c85947305d81e3b2a2b0cc4c2b036fdfb870e /net/bluetooth/l2cap_sock.c | |
| parent | 50e2a30cf6fcaeb2d27360ba614dd169a10041c5 (diff) | |
| parent | 2096ae6ca647302d50a68aa36cb66a00e7dfac70 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'net/bluetooth/l2cap_sock.c')
| -rw-r--r-- | net/bluetooth/l2cap_sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index a4bb27e8427e..b94abd30e6f9 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/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; } |