diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-22 14:36:10 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-22 14:36:10 -0400 |
| commit | 4e42200cafe0c7a90fc26b82b2088c4f2bcb007a (patch) | |
| tree | 387f2a5ee2fc61ed85e15ad9f65184d06f382c12 /net/bluetooth/mgmt.c | |
| parent | 8633c0846160af0b8cfb983bbccd94ae42922af8 (diff) | |
| parent | 931cb03afed7b541392295f3afc4638da32f08a0 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/bluetooth/mgmt.c')
| -rw-r--r-- | net/bluetooth/mgmt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 991d5b667674..3e5e3362ea00 100644 --- 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; |