tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'for-net-2022-07-05' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

Luiz Augusto von Dentz says:

====================
bluetooth pull request for net:

- Fix deadlock when powering on.

* tag 'for-net-2022-07-05' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth:
Bluetooth: core: Fix deadlock on hci_power_on_sync.
====================

Link: https://lore.kernel.org/r/20220705202700.1689796-1-luiz.dentz@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Jakub Kicinski 26c12725 029cc096

+3 -1
+3
net/bluetooth/hci_core.c
··· 571 571 goto done; 572 572 } 573 573 574 + cancel_work_sync(&hdev->power_on); 574 575 if (hci_dev_test_and_clear_flag(hdev, HCI_AUTO_OFF)) 575 576 cancel_delayed_work(&hdev->power_off); 576 577 ··· 2675 2674 write_lock(&hci_dev_list_lock); 2676 2675 list_del(&hdev->list); 2677 2676 write_unlock(&hci_dev_list_lock); 2677 + 2678 + cancel_work_sync(&hdev->power_on); 2678 2679 2679 2680 hci_cmd_sync_clear(hdev); 2680 2681
-1
net/bluetooth/hci_sync.c
··· 4088 4088 4089 4089 bt_dev_dbg(hdev, ""); 4090 4090 4091 - cancel_work_sync(&hdev->power_on); 4092 4091 cancel_delayed_work(&hdev->power_off); 4093 4092 cancel_delayed_work(&hdev->ncmd_timer); 4094 4093