From 922875edcd018425c4612af670a1dc3feff82ad5 Mon Sep 17 00:00:00 2001
From: Andre Guedes <andre.guedes@openbossa.org>
Date: Mon, 2 Jan 2012 19:18:10 -0300
Subject: [PATCH] --- yaml --- r: 284316 b: refs/heads/master c:
 c1b9b4f45f014093231c568be9b5c2e392943696 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0d71ceb1c876..68aed33ec803 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5b32b653dedb29eb95e57cbbaefc4abf7141cb2
+refs/heads/master: c1b9b4f45f014093231c568be9b5c2e392943696
diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c
index 10152d23c987..444ca410b9e5 100644
--- a/trunk/net/bluetooth/hci_event.c
+++ b/trunk/net/bluetooth/hci_event.c
@@ -1054,9 +1054,8 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
 	case LE_SCANNING_DISABLED:
 		clear_bit(HCI_LE_SCAN, &hdev->dev_flags);
 
-		cancel_delayed_work_sync(&hdev->adv_work);
 		queue_delayed_work(hdev->workqueue, &hdev->adv_work,
-						 jiffies + ADV_CLEAR_TIMEOUT);
+							ADV_CLEAR_TIMEOUT);
 		break;
 
 	default: