aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_core.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2013-01-14 15:33:52 -0500
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-01-17 23:58:37 -0500
commit46818ed514102c8d251d4aff5c99ad3ff6805432 (patch)
tree7313ef0c4b35ddbc24df00f68194f10ba280f393 /net/bluetooth/hci_core.c
parent1920257316615676387794cc5fb838183b3bae7f (diff)
Bluetooth: Fix using system-global workqueue when not necessary
There's a per-HCI device workqueue (hdev->workqueue) that should be used for general per-HCI device work (except hdev->req_workqueue that's for hci_request() related work). This patch fixes places using the system-global work queue and makes them use the hdev->workqueue instead. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth/hci_core.c')
-rw-r--r--net/bluetooth/hci_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 545553b82295..e061b354d2c4 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1622,8 +1622,8 @@ static int hci_do_le_scan(struct hci_dev *hdev, u8 type, u16 interval,
1622 if (err < 0) 1622 if (err < 0)
1623 return err; 1623 return err;
1624 1624
1625 schedule_delayed_work(&hdev->le_scan_disable, 1625 queue_delayed_work(hdev->workqueue, &hdev->le_scan_disable,
1626 msecs_to_jiffies(timeout)); 1626 msecs_to_jiffies(timeout));
1627 1627
1628 return 0; 1628 return 0;
1629} 1629}