diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-06-05 14:10:07 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-06-05 14:10:07 -0400 |
commit | 67be1e4f4b0a512f6af3a7db681ae9b62d31de5e (patch) | |
tree | 690ef67ff6b630344e8fd86c7c84b0d31f468f24 /net/bluetooth/l2cap_sock.c | |
parent | a715c7ddd65a1a3b2839b8ebd759bb2d361f7675 (diff) | |
parent | 8a96f3cd22878fc0bb564a8478a6e17c0b8dca73 (diff) |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'net/bluetooth/l2cap_sock.c')
-rw-r--r-- | net/bluetooth/l2cap_sock.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index ef5e5b04f34f..ade3fb4c23bc 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c | |||
@@ -1180,13 +1180,16 @@ static struct l2cap_chan *l2cap_sock_new_connection_cb(struct l2cap_chan *chan) | |||
1180 | /* Check for backlog size */ | 1180 | /* Check for backlog size */ |
1181 | if (sk_acceptq_is_full(parent)) { | 1181 | if (sk_acceptq_is_full(parent)) { |
1182 | BT_DBG("backlog full %d", parent->sk_ack_backlog); | 1182 | BT_DBG("backlog full %d", parent->sk_ack_backlog); |
1183 | release_sock(parent); | ||
1183 | return NULL; | 1184 | return NULL; |
1184 | } | 1185 | } |
1185 | 1186 | ||
1186 | sk = l2cap_sock_alloc(sock_net(parent), NULL, BTPROTO_L2CAP, | 1187 | sk = l2cap_sock_alloc(sock_net(parent), NULL, BTPROTO_L2CAP, |
1187 | GFP_ATOMIC); | 1188 | GFP_ATOMIC); |
1188 | if (!sk) | 1189 | if (!sk) { |
1190 | release_sock(parent); | ||
1189 | return NULL; | 1191 | return NULL; |
1192 | } | ||
1190 | 1193 | ||
1191 | bt_sock_reclassify_lock(sk, BTPROTO_L2CAP); | 1194 | bt_sock_reclassify_lock(sk, BTPROTO_L2CAP); |
1192 | 1195 | ||