From 54f5b6bf176cafa1e7d1ed825d68a2acaf985850 Mon Sep 17 00:00:00 2001
From: "Gustavo F. Padovan" <padovan@profusion.mobi>
Date: Sat, 17 Dec 2011 14:52:27 -0200
Subject: [PATCH] --- yaml --- r: 279276 b: refs/heads/master c:
 80b7ab33414beeb3c17600af9b69d903f5cf8a7d h: refs/heads/master 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 08717ec7b2bc..d1e2b703c63d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d57dc6806599ca7d389fc9410eefbc1a7dc32bc
+refs/heads/master: 80b7ab33414beeb3c17600af9b69d903f5cf8a7d
diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c
index 2b20941ebcb1..a14a60d5890b 100644
--- a/trunk/net/bluetooth/hci_core.c
+++ b/trunk/net/bluetooth/hci_core.c
@@ -937,7 +937,7 @@ static void hci_power_on(struct work_struct *work)
 		return;
 
 	if (test_bit(HCI_AUTO_OFF, &hdev->flags))
-		queue_delayed_work(hdev->workqueue, &hdev->power_off,
+		schedule_delayed_work(&hdev->power_off,
 					msecs_to_jiffies(AUTO_OFF_TIMEOUT));
 
 	if (test_and_clear_bit(HCI_SETUP, &hdev->flags))
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index ad4817c9ef2f..f4af6593c431 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -417,7 +417,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);
 	else
-		queue_work(hdev->workqueue, &hdev->power_off.work);
+		schedule_work(&hdev->power_off.work);
 
 	err = 0;