---

yaml --- r: 243690 b: refs/heads/master c: a0cc9a1 h: refs/heads/master v: v3
git-mirror · Mar 24, 2011 · 9978c3a · 9978c3a
1 parent 3efec40
commit 9978c3a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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: