diff options
author | David S. Miller <davem@davemloft.net> | 2012-01-04 21:35:43 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-01-04 21:35:43 -0500 |
commit | 117ff42fd43e92d24c6aa6f3e4f0f1e1edada140 (patch) | |
tree | c08e1c0357fde481a16489b77feb8f6073faf538 /net/bluetooth | |
parent | 1d5783030a14d1b6ee763f63c8136e581f48b365 (diff) | |
parent | 805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/bluetooth')
-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 6d38d80195c..845da3ee56a 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -643,7 +643,7 @@ static int hci_dev_do_close(struct hci_dev *hdev) | |||
643 | if (!test_bit(HCI_RAW, &hdev->flags)) { | 643 | if (!test_bit(HCI_RAW, &hdev->flags)) { |
644 | set_bit(HCI_INIT, &hdev->flags); | 644 | set_bit(HCI_INIT, &hdev->flags); |
645 | __hci_request(hdev, hci_reset_req, 0, | 645 | __hci_request(hdev, hci_reset_req, 0, |
646 | msecs_to_jiffies(HCI_INIT_TIMEOUT)); | 646 | msecs_to_jiffies(250)); |
647 | clear_bit(HCI_INIT, &hdev->flags); | 647 | clear_bit(HCI_INIT, &hdev->flags); |
648 | } | 648 | } |
649 | 649 | ||