---

yaml --- r: 284316 b: refs/heads/master c: c1b9b4f h: refs/heads/master v: v3
git-mirror · Jan 3, 2012 · 922875e · 922875e
1 parent 366c3f6
commit 922875e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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: