From: Vasyl Vavrychuk <vasyl.vavrychuk@opensynergy.com>

Date: Tue, 26 Apr 2022 11:18:23 +0300

Subject: Bluetooth: core: Fix missing power_on work cancel on HCI close

Patch-mainline: v5.19-rc1

Git-commit: ff7f2926114d3a50f5ffe461a9bce8d761748da5

References: jsc#PED-1407

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>

Acked-by: Lee, Chun-Yi <jlee@suse.com>

---

 net/bluetooth/hci_core.c |    2 --

 net/bluetooth/hci_sync.c |    1 +

 2 files changed, 1 insertion(+), 2 deletions(-)

--- a/net/bluetooth/hci_core.c

+++ b/net/bluetooth/hci_core.c

@@ -2675,8 +2675,6 @@ void hci_unregister_dev(struct hci_dev *

 	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))

--- a/net/bluetooth/hci_sync.c

+++ b/net/bluetooth/hci_sync.c

@@ -4089,6 +4089,7 @@ int hci_dev_close_sync(struct hci_dev *h

 	bt_dev_dbg(hdev, "");

+	cancel_work_sync(&hdev->power_on);

 	cancel_delayed_work(&hdev->power_off);

 	cancel_delayed_work(&hdev->ncmd_timer);