diff options
author | David S. Miller <davem@davemloft.net> | 2011-11-04 17:14:34 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-11-04 17:14:34 -0400 |
commit | 39b02648d251dbfa27b576d55eeab4cc62228d86 (patch) | |
tree | c442c1edb4242667d65340c20adee7da7afb66c2 /net/bluetooth/hci_core.c | |
parent | 1583171492eb514e267c7b51e96846b38de0f544 (diff) | |
parent | 22097fd297c85ec6c2e700d506f231f7cae442e1 (diff) | |
download | op-kernel-dev-39b02648d251dbfa27b576d55eeab4cc62228d86.zip op-kernel-dev-39b02648d251dbfa27b576d55eeab4cc62228d86.tar.gz |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
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); } |