summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_core.c
diff options
context:
space:
mode:
authorMarcel Holtmann2013-10-06 10:16:22 +0200
committerJohan Hedberg2013-10-06 11:00:40 +0200
commit01cd340427ab01a744a539981bcc4ef00e5ad133 (patch)
treee0972dda26e755b1c14ac35ce7849b95049e3b53 /net/bluetooth/hci_core.c
parentBluetooth: Reject enabling controllers without valid addresses (diff)
downloadkernel-qcow2-linux-01cd340427ab01a744a539981bcc4ef00e5ad133.tar.gz
kernel-qcow2-linux-01cd340427ab01a744a539981bcc4ef00e5ad133.tar.xz
kernel-qcow2-linux-01cd340427ab01a744a539981bcc4ef00e5ad133.zip
Bluetooth: Use explicit check for BR/EDR device type
The BR/EDR and LE setup procedures apply only to BR/EDR device types and so check for that explicitly. Checking that it is not an AMP controller is dangerous in case there will be ever a third device type. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/hci_core.c')
-rw-r--r--net/bluetooth/hci_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 4a9b8dda754e..bf3c5b0c22b9 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2357,7 +2357,7 @@ int hci_register_dev(struct hci_dev *hdev)
set_bit(HCI_SETUP, &hdev->dev_flags);
- if (hdev->dev_type != HCI_AMP) {
+ if (hdev->dev_type == HCI_BREDR) {
set_bit(HCI_AUTO_OFF, &hdev->dev_flags);
/* Assume BR/EDR support until proven otherwise (such as
* through reading supported features during init.