diff options
author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2012-06-29 08:07:00 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-06-30 11:35:49 -0400 |
commit | ce2be9acff7f71b94e3d68e08df3f1592cae05a3 (patch) | |
tree | 8786ecc6e37c65cfc8b83c58a613d6390bae0b51 /net/bluetooth | |
parent | 74ad8fdaefe6ccb8ef1918394a9d04a036658346 (diff) |
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>
Diffstat (limited to 'net/bluetooth')
-rw-r--r-- | net/bluetooth/hci_core.c | 5 |
1 files changed, 4 insertions, 1 deletions
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) | |||
1743 | } | 1743 | } |
1744 | } | 1744 | } |
1745 | 1745 | ||
1746 | set_bit(HCI_AUTO_OFF, &hdev->dev_flags); | ||
1747 | set_bit(HCI_SETUP, &hdev->dev_flags); | 1746 | set_bit(HCI_SETUP, &hdev->dev_flags); |
1747 | |||
1748 | if (hdev->dev_type != HCI_AMP) | ||
1749 | set_bit(HCI_AUTO_OFF, &hdev->dev_flags); | ||
1750 | |||
1748 | schedule_work(&hdev->power_on); | 1751 | schedule_work(&hdev->power_on); |
1749 | 1752 | ||
1750 | hci_notify(hdev, HCI_DEV_REG); | 1753 | hci_notify(hdev, HCI_DEV_REG); |