Bluetooth: Do not auto off AMP controller
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Fri, 29 Jun 2012 12:07:00 +0000 (15:07 +0300)
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>
Sat, 30 Jun 2012 15:35:49 +0000 (12:35 -0300)
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

index 32dcb09cdb5dee9e58903954f85c3030f6867686..f932d663ff68320ae12841952bb54fd274520f9a 100644 (file)
@@ -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);