[PATCH 2/2] Bluetooth: Remove wait for delayed work to finish
From: Ulisses Furquim <hidden>
Date: 2012-01-18 12:48:04
Subsystem:
bluetooth subsystem, the rest · Maintainers:
Marcel Holtmann, Luiz Augusto von Dentz, Linus Torvalds
Do not wait for delayed work to finish where it's not needed. In the case of adv_work the handler is already protected by the hdev lock and removing the wait we also avoid introducing deadlocks involving the delayed work lock. Signed-off-by: Ulisses Furquim <redacted> --- net/bluetooth/hci_core.c | 2 +- net/bluetooth/hci_event.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index a7b7200..b4041be 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c@@ -1731,7 +1731,7 @@ void hci_unregister_dev(struct hci_dev *hdev) hci_del_sysfs(hdev); - cancel_delayed_work_sync(&hdev->adv_work); + cancel_delayed_work(&hdev->adv_work); destroy_workqueue(hdev->workqueue);
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index c2fe964..f28cbae 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c@@ -1045,7 +1045,7 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev, case LE_SCANNING_ENABLED: set_bit(HCI_LE_SCAN, &hdev->dev_flags); - cancel_delayed_work_sync(&hdev->adv_work); + cancel_delayed_work(&hdev->adv_work); hci_dev_lock(hdev); hci_adv_entries_clear(hdev);
--
1.7.8.rc4