diff options
| author |  Vasyl Vavrychuk <vasyl.vavrychuk@opensynergy.com>
| 2022-04-26 11:18:23 +0300 |
|---|---|---|
| committer |  Marcel Holtmann <marcel@holtmann.org>
| 2022-05-13 13:05:49 +0200 |
| commit | ff7f2926114d3a50f5ffe461a9bce8d761748da5 (patch) | |
| tree | 219c8445a587f1c33bb93442f53e92fd9a5d4830 /net/bluetooth | |
| parent | Bluetooth: btusb: add support for Qualcomm WCN785x (diff) | |
| download | linux-ff7f2926114d3a50f5ffe461a9bce8d761748da5.tar.gz linux-ff7f2926114d3a50f5ffe461a9bce8d761748da5.tar.bz2 linux-ff7f2926114d3a50f5ffe461a9bce8d761748da5.zip | |
Bluetooth: core: Fix missing power_on work cancel on HCI close
Move power_on work cancel to hci_dev_close_sync to ensure that power_on
work is canceled after HCI interface down, power off, rfkill, etc.
For example, if
hciconfig hci0 down
is done early enough during boot, it may run before power_on work.
Then, power_on work will actually bring up interface despite above
hciconfig command.
Signed-off-by: Vasyl Vavrychuk <vasyl.vavrychuk@opensynergy.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/hci_core.c | 2 | ||||
| -rw-r--r-- | net/bluetooth/hci_sync.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 45c2dd2e1590..5abb2ca5b129 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -2675,8 +2675,6 @@ void hci_unregister_dev(struct hci_dev *hdev) list_del(&hdev->list); write_unlock(&hci_dev_list_lock); - cancel_work_sync(&hdev->power_on); - hci_cmd_sync_clear(hdev); if (!test_bit(HCI_QUIRK_NO_SUSPEND_NOTIFIER, &hdev->quirks)) diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c index b06e01bef66e..a6ada9dcede5 100644 --- a/net/bluetooth/hci_sync.c +++ b/net/bluetooth/hci_sync.c @@ -4089,6 +4089,7 @@ int hci_dev_close_sync(struct hci_dev *hdev) bt_dev_dbg(hdev, ""); + cancel_work_sync(&hdev->power_on); cancel_delayed_work(&hdev->power_off); cancel_delayed_work(&hdev->ncmd_timer); |