From 9978c3a7661e8863397449316547a3e972e3dde3 Mon Sep 17 00:00:00 2001
From: Andrei Emeltchenko <andrei.emeltchenko@nokia.com>
Date: Thu, 24 Mar 2011 17:16:08 +0200
Subject: [PATCH] --- yaml --- r: 243690 b: refs/heads/master c:
 a0cc9a1b5712ea52aaa4e7abfa0ec2dbe0d820ff h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/net/bluetooth/l2cap_sock.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 09ccaf87d0c8..4d88d4760337 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6994ca5e8ade57d18b7d1e05aad040c441a2ad37
+refs/heads/master: a0cc9a1b5712ea52aaa4e7abfa0ec2dbe0d820ff
diff --git a/trunk/net/bluetooth/l2cap_sock.c b/trunk/net/bluetooth/l2cap_sock.c
index fc85e7ae33c7..f77308e63e58 100644
--- a/trunk/net/bluetooth/l2cap_sock.c
+++ b/trunk/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: