diff options
| author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2012-06-29 14:07:00 +0200 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-06-30 17:35:49 +0200 |
| commit | ce2be9acff7f71b94e3d68e08df3f1592cae05a3 (patch) | |
| tree | 8786ecc6e37c65cfc8b83c58a613d6390bae0b51 /net/bluetooth | |
| parent | Bluetooth: bluecard_cs: Shorten scope for iobase (diff) | |
| download | linux-ce2be9acff7f71b94e3d68e08df3f1592cae05a3.tar.xz linux-ce2be9acff7f71b94e3d68e08df3f1592cae05a3.zip | |
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) } } - 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); |