diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-01-04 20:37:30 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-01-04 20:37:30 +0400 |
| commit | d8f46ff11081f03b09efe82245a3257bab6bf60e (patch) | |
| tree | fe47a5fe5ef62920ee3e1ffe5a2fd7a29918c6b0 /net | |
| parent | 405cc2736527bd506fd8f652308b03b2c8a1e8b9 (diff) | |
| parent | b015dbc0f95eef34819515bd403a62569bca23df (diff) | |
| download | linux-d8f46ff11081f03b09efe82245a3257bab6bf60e.tar.xz | |
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.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); } |