projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
[firefly-linux-kernel-4.4.55.git]
/
net
/
bluetooth
/
mgmt.c
diff --git
a/net/bluetooth/mgmt.c
b/net/bluetooth/mgmt.c
index c72307cc25fc7af2fc679203ef19f29142d17a2f..a6e0f3d8da6cb21eb9391660fc5e2df121210050 100644
(file)
--- a/
net/bluetooth/mgmt.c
+++ b/
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;