diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-05-12 14:06:10 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-05-12 14:06:10 -0400 |
| commit | 15cb309614f35df344b9f06a9ea9f077d1e449db (patch) | |
| tree | 85e244564f42381be5bf9d81ed867bb793fa976d /net/bluetooth/mgmt.c | |
| parent | 4daf50f20256e0022c87c1609226e971a70c82fd (diff) | |
| parent | 55183d06cd1bd939ceccdad628b0aae12c86b803 (diff) | |
| download | kernel_samsung_smdk4412-15cb309614f35df344b9f06a9ea9f077d1e449db.zip kernel_samsung_smdk4412-15cb309614f35df344b9f06a9ea9f077d1e449db.tar.gz kernel_samsung_smdk4412-15cb309614f35df344b9f06a9ea9f077d1e449db.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6
Diffstat (limited to 'net/bluetooth/mgmt.c')
| -rw-r--r-- | net/bluetooth/mgmt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 2481d25..dae382c 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -1033,6 +1033,9 @@ static int disconnect(struct sock *sk, u16 index, unsigned char *data, u16 len) } conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->bdaddr); + if (!conn) + conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->bdaddr); + if (!conn) { err = cmd_status(sk, index, MGMT_OP_DISCONNECT, ENOTCONN); goto failed; |