summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/mgmt.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2015-11-11 08:11:23 +0200
committerMarcel Holtmann <marcel@holtmann.org>2015-11-19 17:50:30 +0100
commit7c1fbed23981faff2840ddc8909e7c78d80ade30 (patch)
tree0a0cfbebbd170fc678030bb2c7a51b0bd3657bb7 /net/bluetooth/mgmt.c
parent145a0913ef180af6be7af2c50056ae171c2a2b94 (diff)
downloadblackbird-obmc-linux-7c1fbed23981faff2840ddc8909e7c78d80ade30.tar.gz
blackbird-obmc-linux-7c1fbed23981faff2840ddc8909e7c78d80ade30.zip
Bluetooth: Move LE scan disable/restart behind req_workqueue
To avoid any risks of races, place also these LE scan modification work callbacks behind the same work queue as the other LE scan changes. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/mgmt.c')
-rw-r--r--net/bluetooth/mgmt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index bb870c3aadae..a229cfd0530e 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -4367,7 +4367,7 @@ static void start_discovery_complete(struct hci_dev *hdev, u8 status,
hdev->discovery.scan_duration = timeout;
}
- queue_delayed_work(hdev->workqueue,
+ queue_delayed_work(hdev->req_workqueue,
&hdev->le_scan_disable, timeout);
}
@@ -8389,7 +8389,7 @@ static void restart_le_scan(struct hci_dev *hdev)
hdev->discovery.scan_duration))
return;
- queue_delayed_work(hdev->workqueue, &hdev->le_scan_restart,
+ queue_delayed_work(hdev->req_workqueue, &hdev->le_scan_restart,
DISCOV_LE_RESTART_DELAY);
}
OpenPOWER on IntegriCloud