git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Revert "Bluetooth: Increase HCI reset timeout in hci_dev_do_close"
[pandora-kernel.git]
/
net
/
bluetooth
/
hci_core.c
diff --git
a/net/bluetooth/hci_core.c
b/net/bluetooth/hci_core.c
index
be84ae3
..
b84458d
100644
(file)
--- 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);
}