| commit | f9dc73e541348288b530c62c21d0fb8fdc7bbd0f | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Jan 03 14:26:56 2012 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Jan 03 14:26:56 2012 -0500 |
| tree | caf6201912169f847c0a2b6ab85c4ac1ca65f0dd | |
| parent | 96f1f05af76b601ab21a7dc603ae0a1cea4efc3d [diff] | |
| parent | cad44c2bf6165e46e309d4db0ffd286a9259aa2a [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index be84ae3..b84458d 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c
@@ -613,7 +613,7 @@ 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); }