diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2012-01-03 14:26:56 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-01-03 14:26:56 -0500 |
| commit | f9dc73e541348288b530c62c21d0fb8fdc7bbd0f (patch) | |
| tree | caf6201912169f847c0a2b6ab85c4ac1ca65f0dd | |
| parent | iwlwifi: update SCD BC table for all SCD queues (diff) | |
| parent | Revert "Bluetooth: Increase HCI reset timeout in hci_dev_do_close" (diff) | |
| download | linux-dev-f9dc73e541348288b530c62c21d0fb8fdc7bbd0f.tar.xz linux-dev-f9dc73e541348288b530c62c21d0fb8fdc7bbd0f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
| -rw-r--r-- | net/bluetooth/hci_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index be84ae33ae36..b84458dcc226 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); } |