diff options
| author | Andrei Emeltchenko | 2011-11-11 16:02:15 +0100 |
|---|---|---|
| committer | Gustavo F. Padovan | 2011-11-16 19:54:29 +0100 |
| commit | 07e3b94ac385cc9d5fd31d6dcd233da0958b9984 (patch) | |
| tree | 64c77f2c74458752f2b65308eab58af944e6246f /net/bluetooth/hci_core.c | |
| parent | Bluetooth: Move scope of kernel parameter enable_hs (diff) | |
| download | kernel-qcow2-linux-07e3b94ac385cc9d5fd31d6dcd233da0958b9984.tar.gz kernel-qcow2-linux-07e3b94ac385cc9d5fd31d6dcd233da0958b9984.tar.xz kernel-qcow2-linux-07e3b94ac385cc9d5fd31d6dcd233da0958b9984.zip | |
Bluetooth: Do not set HCI_RAW when HS enabled
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/hci_core.c')
| -rw-r--r-- | net/bluetooth/hci_core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index fb3feeb185d7..cf18f6d1b9a3 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -521,8 +521,9 @@ int hci_dev_open(__u16 dev) if (test_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks)) set_bit(HCI_RAW, &hdev->flags); - /* Treat all non BR/EDR controllers as raw devices for now */ - if (hdev->dev_type != HCI_BREDR) + /* Treat all non BR/EDR controllers as raw devices if + enable_hs is not set */ + if (hdev->dev_type != HCI_BREDR && !enable_hs) set_bit(HCI_RAW, &hdev->flags); if (hdev->open(hdev)) { |