diff options
| author | Johan Hedberg | 2013-01-14 21:33:51 +0100 |
|---|---|---|
| committer | Gustavo Padovan | 2013-01-18 05:56:20 +0100 |
| commit | 1920257316615676387794cc5fb838183b3bae7f (patch) | |
| tree | 56ae3f888cb0cf41f99d00bfd83baf740ed450ec /net/bluetooth/hci_core.c | |
| parent | Bluetooth: Add a new workqueue for hci_request operations (diff) | |
| download | kernel-qcow2-linux-1920257316615676387794cc5fb838183b3bae7f.tar.gz kernel-qcow2-linux-1920257316615676387794cc5fb838183b3bae7f.tar.xz kernel-qcow2-linux-1920257316615676387794cc5fb838183b3bae7f.zip | |
Bluetooth: Use req_workqueue for hci_request operations
This patch converts work assignment relying on hci_request() from the
system-global work queue to the per-HCI device specific work queue
(hdev->req_workqueue) intended for hci_request() related tasks.
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.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index f73907aad79f..545553b82295 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -1146,7 +1146,8 @@ static void hci_power_on(struct work_struct *work) return; if (test_bit(HCI_AUTO_OFF, &hdev->dev_flags)) - schedule_delayed_work(&hdev->power_off, HCI_AUTO_OFF_TIMEOUT); + queue_delayed_work(hdev->req_workqueue, &hdev->power_off, + HCI_AUTO_OFF_TIMEOUT); if (test_and_clear_bit(HCI_SETUP, &hdev->dev_flags)) mgmt_index_added(hdev); @@ -1830,7 +1831,7 @@ int hci_register_dev(struct hci_dev *hdev) hci_notify(hdev, HCI_DEV_REG); hci_dev_hold(hdev); - schedule_work(&hdev->power_on); + queue_work(hdev->req_workqueue, &hdev->power_on); return id; |