diff options
| author | Andrei Emeltchenko | 2012-07-19 16:03:40 +0200 |
|---|---|---|
| committer | Gustavo Padovan | 2012-08-06 20:02:54 +0200 |
| commit | bb4b2a9ae38ef3bac69627f35e4f916752631fd1 (patch) | |
| tree | 451a3577621b6169767a5f3605b9cf536e0a804f /net/bluetooth/hci_core.c | |
| parent | Bluetooth: Remove missing code (diff) | |
| download | kernel-qcow2-linux-bb4b2a9ae38ef3bac69627f35e4f916752631fd1.tar.gz kernel-qcow2-linux-bb4b2a9ae38ef3bac69627f35e4f916752631fd1.tar.xz kernel-qcow2-linux-bb4b2a9ae38ef3bac69627f35e4f916752631fd1.zip | |
Bluetooth: mgmt: Managing only BR/EDR HCI controllers
Add check that HCI controller is BR/EDR. AMP controller shall not be
managed by mgmt interface and consequently user space.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth/hci_core.c')
| -rw-r--r-- | net/bluetooth/hci_core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index d4de5db18d5a..fa974a19d365 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -696,7 +696,8 @@ int hci_dev_open(__u16 dev) hci_dev_hold(hdev); set_bit(HCI_UP, &hdev->flags); hci_notify(hdev, HCI_DEV_UP); - if (!test_bit(HCI_SETUP, &hdev->dev_flags)) { + if (!test_bit(HCI_SETUP, &hdev->dev_flags) && + mgmt_valid_hdev(hdev)) { hci_dev_lock(hdev); mgmt_powered(hdev, 1); hci_dev_unlock(hdev); @@ -797,7 +798,8 @@ static int hci_dev_do_close(struct hci_dev *hdev) * and no tasks are scheduled. */ hdev->close(hdev); - if (!test_and_clear_bit(HCI_AUTO_OFF, &hdev->dev_flags)) { + if (!test_and_clear_bit(HCI_AUTO_OFF, &hdev->dev_flags) && + mgmt_valid_hdev(hdev)) { hci_dev_lock(hdev); mgmt_powered(hdev, 0); hci_dev_unlock(hdev); |