From: Johan Hedberg <johan.hedberg@intel.com>
Date: Mon, 21 Oct 2013 13:51:53 +0000 (+0300)
Subject: Bluetooth: Fix enabling fast connectable on LE-only controllers
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=547003b114bcb96555cf73ec7f45ab64b2dcaf67;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Bluetooth: Fix enabling fast connectable on LE-only controllers

The current "fast connectable" feature is BR/EDR-only, so add a proper
check for BR/EDR support before proceeding with the associated HCI
commands.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index bd91ee5f130c..074d83690a41 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1307,6 +1307,9 @@ static void write_fast_connectable(struct hci_request *req, bool enable)
 	struct hci_cp_write_page_scan_activity acp;
 	u8 type;
 
+	if (!test_bit(HCI_BREDR_ENABLED, &hdev->dev_flags))
+		return;
+
 	if (hdev->hci_ver < BLUETOOTH_VER_1_2)
 		return;