From: Marcel Holtmann <marcel@holtmann.org>
Date: Sun, 6 Oct 2013 08:16:22 +0000 (-0700)
Subject: Bluetooth: Use explicit check for BR/EDR device type
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=01cd340427ab01a744a539981bcc4ef00e5ad133;p=linux-beck.git

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>
---

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.