From ab5f0e62a9ea1858195d1f254f2fbb231748961f Mon Sep 17 00:00:00 2001
From: "Gustavo F. Padovan" <padovan@profusion.mobi>
Date: Sun, 18 Dec 2011 12:40:32 -0200
Subject: [PATCH] --- yaml --- r: 279279 b: refs/heads/master c:
 7f971041cf591d8cf3b289c9d78739638ca7e629 h: refs/heads/master i:   279277:
 b020a80fb3a551a4221d4f50029942dafd605f66   279275:
 1c4147b19cf35d121d6eb378e2cceaa787400e6c   279271:
 0607bbd339297390167a074e9760a2bd9c28b267   279263:
 2472de344b3189bbd8ee4c1c2f4a1bb4d20d9d3e v: v3

---
 [refs]                         | 2 +-
 trunk/net/bluetooth/hci_core.c | 2 +-
 trunk/net/bluetooth/mgmt.c     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 30a37e41a92d..ff74d15f4799 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d438e335ce83ff0528415a58632dc6508e4fde1
+refs/heads/master: 7f971041cf591d8cf3b289c9d78739638ca7e629
diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c
index dcbb7655d772..b250685d59a5 100644
--- a/trunk/net/bluetooth/hci_core.c
+++ b/trunk/net/bluetooth/hci_core.c
@@ -1522,7 +1522,7 @@ int hci_register_dev(struct hci_dev *hdev)
 
 	set_bit(HCI_AUTO_OFF, &hdev->flags);
 	set_bit(HCI_SETUP, &hdev->flags);
-	queue_work(hdev->workqueue, &hdev->power_on);
+	schedule_work(&hdev->power_on);
 
 	hci_notify(hdev, HCI_DEV_REG);
 
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index f4af6593c431..ffd1c01c7d0e 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -415,7 +415,7 @@ static int set_powered(struct sock *sk, u16 index, unsigned char *data, u16 len)
 	}
 
 	if (cp->val)
-		queue_work(hdev->workqueue, &hdev->power_on);
+		schedule_work(&hdev->power_on);
 	else
 		schedule_work(&hdev->power_off.work);