diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-01 17:15:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-01 17:15:25 -0700 |
| commit | 5e58e5283a0a0a99ee970e7e5c80c6541693376e (patch) | |
| tree | 40409bad22ddc6c37b23ae8e518bbd6b2f39007c /net/bluetooth/l2cap_sock.c | |
| parent | c100c8f4c3c6f2a407bdbaaad2c4f1062e6a473a (diff) | |
| parent | ffd8c746fbef50cf12df239f9d23c2afe1a2c3cb (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/bluetooth/l2cap_sock.c')
| -rw-r--r-- | net/bluetooth/l2cap_sock.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index fc85e7ae33c7..f77308e63e58 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -923,8 +923,9 @@ void __l2cap_sock_close(struct sock *sk, int reason) rsp.status = cpu_to_le16(L2CAP_CS_NO_INFO); l2cap_send_cmd(conn, l2cap_pi(sk)->ident, L2CAP_CONN_RSP, sizeof(rsp), &rsp); - } else - l2cap_chan_del(sk, reason); + } + + l2cap_chan_del(sk, reason); break; case BT_CONNECT: |