---

yaml --- r: 315652 b: refs/heads/master c: 975b91b h: refs/heads/master v: v3
git-mirror · Jun 12, 2012 · 0f27808 · 0f27808
1 parent bb877e9
commit 0f27808
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: cbe461c526e1e0f8b55f91180df64f02d8daed45
+refs/heads/master: 975b91bb17e70c0dc33ad07f16097106a9c2c6a2
diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c
@@ -783,7 +783,7 @@ static int hci_dev_do_close(struct hci_dev *hdev)
 	    test_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks)) {
 		set_bit(HCI_INIT, &hdev->flags);
 		__hci_request(hdev, hci_reset_req, 0,
-			      msecs_to_jiffies(250));
+			      msecs_to_jiffies(HCI_CMD_TIMEOUT));
 		clear_bit(HCI_INIT, &hdev->flags);
 	}