---

yaml --- r: 277714 b: refs/heads/master c: 43611a7 h: refs/heads/master v: v3
git-mirror · Nov 7, 2011 · 5541d25 · 5541d25
1 parent a14b523
commit 5541d25
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db54467a89266c02f9ce6c6db1d193365cff62a4
+refs/heads/master: 43611a7b16038753e0510dfb0c038c80a10c80c3
diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c
@@ -611,7 +611,7 @@ static int hci_dev_do_close(struct hci_dev *hdev)
 	if (!test_bit(HCI_RAW, &hdev->flags)) {
 		set_bit(HCI_INIT, &hdev->flags);
 		__hci_request(hdev, hci_reset_req, 0,
-					msecs_to_jiffies(250));
+					msecs_to_jiffies(HCI_INIT_TIMEOUT));
 		clear_bit(HCI_INIT, &hdev->flags);
 	}