---

yaml --- r: 311399 b: refs/heads/master c: f960727 h: refs/heads/master i: 311397: 2a6844e 311395: a11a93c 311391: 5078971 v: v3
git-mirror · Jun 14, 2012 · 90ef591 · 90ef591
1 parent 63b3e97
commit 90ef591
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c4ae5c2e7bfbb7d10d73611f69ac8a8609d84fd
+refs/heads/master: f960727e6c98a36018029c0512aa03f1c5faa914
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
@@ -1598,7 +1598,7 @@ static int disconnect(struct sock *sk, struct hci_dev *hdev, void *data,
 	else
 		conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->addr.bdaddr);
 
-	if (!conn) {
+	if (!conn || conn->state == BT_OPEN || conn->state == BT_CLOSED) {
 		err = cmd_status(sk, hdev->id, MGMT_OP_DISCONNECT,
 				 MGMT_STATUS_NOT_CONNECTED);
 		goto failed;