--- a/net/bluetooth/hci_core.c	2022-05-29 17:21:17.147310600 +0800
+++ b/net/bluetooth/hci_core.c	2022-05-29 17:24:16.095788500 +0800
@@ -2675,6 +2675,7 @@ 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	2022-05-29 17:18:31.625144800 +0800
+++ b/net/bluetooth/hci_sync.c	2022-05-29 17:23:20.415592200 +0800
@@ -4088,7 +4088,6 @@ 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);