---

yaml --- r: 291056 b: refs/heads/master c: 4004b6d h: refs/heads/master v: v3
git-mirror · Feb 23, 2012 · a046760 · a046760
1 parent 528e457
commit a046760
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9997a5332320dbaaee64b5c0581ccaa6589a15c9
+refs/heads/master: 4004b6d96a14edbd157a62ae25bf61022d7caccc
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
@@ -617,10 +617,6 @@ static void mgmt_init_hdev(struct hci_dev *hdev)
 		 */
 		clear_bit(HCI_PAIRABLE, &hdev->dev_flags);
 	}
-
-	if (!test_and_set_bit(HCI_SERVICE_CACHE, &hdev->dev_flags))
-		schedule_delayed_work(&hdev->service_cache,
-				msecs_to_jiffies(SERVICE_CACHE_TIMEOUT));
 }
 
 static int read_controller_info(struct sock *sk, u16 index)
@@ -1399,6 +1395,12 @@ static int remove_uuid(struct sock *sk, u16 index, void *data, u16 len)
 
 	if (memcmp(cp->uuid, bt_uuid_any, 16) == 0) {
 		err = hci_uuids_clear(hdev);
+
+		if (hdev_is_powered(hdev) &&
+				!test_and_set_bit(HCI_SERVICE_CACHE, &hdev->dev_flags))
+			schedule_delayed_work(&hdev->service_cache,
+					msecs_to_jiffies(SERVICE_CACHE_TIMEOUT));
+
 		goto unlock;
 	}