diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-08-14 14:42:54 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-08-14 14:42:54 -0400 |
| commit | 1e55217e174f4e6920fd441dcd3aaf8e37645460 (patch) | |
| tree | 896dcc55f7f3d54022677747cdcfc26897d33549 /net/bluetooth/l2cap_sock.c | |
| parent | 3bf671af14d591ede9251acb0085e8017f3705e7 (diff) | |
| parent | 7dd6753f6d2e7e0ccbf2263cef3a9fff6bc89988 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
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 a4bb27e8427..b94abd30e6f 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; } |