summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorWei-Ning Huang <wnhuang@chromium.org>2016-02-15 17:09:51 +0800
committerMarcel Holtmann <marcel@holtmann.org>2016-02-23 20:29:38 +0100
commitd82142a8b1338e6a4339920863423379c27b0b16 (patch)
tree148964cff4a87302c8d55ba8c12f74e928ab5eff /net/bluetooth
parent28c971d82fb58ef7cba22e5308be6d2d2590473d (diff)
downloadlinux-d82142a8b1338e6a4339920863423379c27b0b16.tar.gz
linux-d82142a8b1338e6a4339920863423379c27b0b16.tar.bz2
linux-d82142a8b1338e6a4339920863423379c27b0b16.zip
Bluetooth: hci_core: cancel power off delayed work properly
When the HCI_AUTO_OFF flag is cleared, the power_off delayed work need to be cancel or HCI will be powered off even if it's managed. Signed-off-by: Wei-Ning Huang <wnhuang@chromium.org> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hci_core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 9c0a6830ff92..2713fc86e85a 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2021,6 +2021,7 @@ static void hci_power_on(struct work_struct *work)
if (test_bit(HCI_UP, &hdev->flags) &&
hci_dev_test_flag(hdev, HCI_MGMT) &&
hci_dev_test_and_clear_flag(hdev, HCI_AUTO_OFF)) {
+ cancel_delayed_work(&hdev->power_off);
hci_req_sync_lock(hdev);
err = __hci_req_hci_power_on(hdev);
hci_req_sync_unlock(hdev);