summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-01-04 11:37:30 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-01-04 11:37:30 -0500
commitd8f46ff11081f03b09efe82245a3257bab6bf60e (patch)
treefe47a5fe5ef62920ee3e1ffe5a2fd7a29918c6b0 /net
parent405cc2736527bd506fd8f652308b03b2c8a1e8b9 (diff)
parentb015dbc0f95eef34819515bd403a62569bca23df (diff)
downloadlinux-d8f46ff11081f03b09efe82245a3257bab6bf60e.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net')
-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 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);
}