aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-01-03 14:26:56 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-01-03 14:26:56 -0500
commitf9dc73e541348288b530c62c21d0fb8fdc7bbd0f (patch)
treecaf6201912169f847c0a2b6ab85c4ac1ca65f0dd
parent96f1f05af76b601ab21a7dc603ae0a1cea4efc3d (diff)
parentcad44c2bf6165e46e309d4db0ffd286a9259aa2a (diff)
downloadlinux-linaro-f9dc73e541348288b530c62c21d0fb8fdc7bbd0f.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
-rw-r--r--net/bluetooth/hci_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index be84ae33ae3..b84458dcc22 100644
--- 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);
}