Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…

…t/padovan/bluetooth
mariux64 · Jan 3, 2012 · f9dc73e · f9dc73e
2 parents 96f1f05 + cad44c2
commit f9dc73e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
@@ -613,7 +613,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(HCI_INIT_TIMEOUT));
+					msecs_to_jiffies(250));
 		clear_bit(HCI_INIT, &hdev->flags);
 	}