From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Date: Fri, 29 Jun 2012 12:07:00 +0000 (+0300)
Subject: Bluetooth: Do not auto off AMP controller
X-Git-Tag: firefly_0821_release~3680^2~2381^2~57^2~2^2~29
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ce2be9acff7f71b94e3d68e08df3f1592cae05a3;p=firefly-linux-kernel-4.4.55.git

Bluetooth: Do not auto off AMP controller

Since AMP controller is not managed by user space do not shut it down.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 32dcb09cdb5d..f932d663ff68 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1743,8 +1743,11 @@ int hci_register_dev(struct hci_dev *hdev)
 		}
 	}
 
-	set_bit(HCI_AUTO_OFF, &hdev->dev_flags);
 	set_bit(HCI_SETUP, &hdev->dev_flags);
+
+	if (hdev->dev_type != HCI_AMP)
+		set_bit(HCI_AUTO_OFF, &hdev->dev_flags);
+
 	schedule_work(&hdev->power_on);
 
 	hci_notify(hdev, HCI_DEV_REG);