commit ce2be9acff7f71b94e3d68e08df3f1592cae05a3
author Andrei Emeltchenko <andrei.emeltchenko@intel.com> Fri Jun 29 15:07:00 2012 +0300
committer Gustavo Padovan <gustavo.padovan@collabora.co.uk> Sat Jun 30 12:35:49 2012 -0300
tree 8786ecc6e37c65cfc8b83c58a613d6390bae0b51
parent 74ad8fdaefe6ccb8ef1918394a9d04a036658346

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>

net/bluetooth/hci_core.c

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 32dcb09..f932d66 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1743,8 +1743,11 @@
 		}
 	}
 
-	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);