diff options
author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-18 09:40:32 -0500 |
---|---|---|
committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-18 14:07:58 -0500 |
commit | 7f971041cf591d8cf3b289c9d78739638ca7e629 (patch) | |
tree | 8b452bc05bb9cedccee77722bc9f7e82df62ba0e /net/bluetooth | |
parent | 6d438e335ce83ff0528415a58632dc6508e4fde1 (diff) |
Bluetooth: Use system workqueue to schedule power_on
hdev->workqueue should be only for rx/tx, so move this one out.
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
-rw-r--r-- | net/bluetooth/hci_core.c | 2 | ||||
-rw-r--r-- | net/bluetooth/mgmt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index dcbb7655d772..b250685d59a5 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -1522,7 +1522,7 @@ int hci_register_dev(struct hci_dev *hdev) | |||
1522 | 1522 | ||
1523 | set_bit(HCI_AUTO_OFF, &hdev->flags); | 1523 | set_bit(HCI_AUTO_OFF, &hdev->flags); |
1524 | set_bit(HCI_SETUP, &hdev->flags); | 1524 | set_bit(HCI_SETUP, &hdev->flags); |
1525 | queue_work(hdev->workqueue, &hdev->power_on); | 1525 | schedule_work(&hdev->power_on); |
1526 | 1526 | ||
1527 | hci_notify(hdev, HCI_DEV_REG); | 1527 | hci_notify(hdev, HCI_DEV_REG); |
1528 | 1528 | ||
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index f4af6593c431..ffd1c01c7d0e 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -415,7 +415,7 @@ static int set_powered(struct sock *sk, u16 index, unsigned char *data, u16 len) | |||
415 | } | 415 | } |
416 | 416 | ||
417 | if (cp->val) | 417 | if (cp->val) |
418 | queue_work(hdev->workqueue, &hdev->power_on); | 418 | schedule_work(&hdev->power_on); |
419 | else | 419 | else |
420 | schedule_work(&hdev->power_off.work); | 420 | schedule_work(&hdev->power_off.work); |
421 | 421 | ||