diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-11-04 14:46:34 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-11-04 14:46:34 -0400 |
commit | 22097fd297c85ec6c2e700d506f231f7cae442e1 (patch) | |
tree | 4a16a6821c5dc82a512b56ade6fcf64e0935d0aa /net/bluetooth/hci_core.c | |
parent | 1a67a573b8d9f02211f36fbab50f6265dc49384a (diff) | |
parent | 54d5026e7c173edae8a27c293c286f1783d21ae8 (diff) | |
download | op-kernel-dev-22097fd297c85ec6c2e700d506f231f7cae442e1.zip op-kernel-dev-22097fd297c85ec6c2e700d506f231f7cae442e1.tar.gz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/bluetooth/hci_core.c')
-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 b84458d..be84ae3 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(250)); + msecs_to_jiffies(HCI_INIT_TIMEOUT)); clear_bit(HCI_INIT, &hdev->flags); } |