diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-19 16:00:11 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-19 16:00:11 -0400 |
| commit | 69d4cfef8befc6ed89e5e3280f3170eb3153d57a (patch) | |
| tree | 63420f8bdf0b26931f7a773bde10ae0ecb3fa3a7 /net/bluetooth/mgmt.c | |
| parent | 858faa57dd9e2b91f3f870fbb1185982e42f5a2b (diff) | |
| parent | ea1e76a3f92f8565d395c549b9ca836c7eaa44b9 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
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, | |||
| 1598 | else | 1598 | else |
| 1599 | conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->addr.bdaddr); | 1599 | conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->addr.bdaddr); |
| 1600 | 1600 | ||
| 1601 | if (!conn) { | 1601 | if (!conn || conn->state == BT_OPEN || conn->state == BT_CLOSED) { |
| 1602 | err = cmd_status(sk, hdev->id, MGMT_OP_DISCONNECT, | 1602 | err = cmd_status(sk, hdev->id, MGMT_OP_DISCONNECT, |
| 1603 | MGMT_STATUS_NOT_CONNECTED); | 1603 | MGMT_STATUS_NOT_CONNECTED); |
| 1604 | goto failed; | 1604 | goto failed; |