summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>2012-06-11 11:13:06 +0300
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-06-12 00:06:19 -0300
commit975b91bb17e70c0dc33ad07f16097106a9c2c6a2 (patch)
treee061ef79f4baedae95f67e1fd7f90f575f9812a6 /net/bluetooth
parentcbe461c526e1e0f8b55f91180df64f02d8daed45 (diff)
downloadlinux-975b91bb17e70c0dc33ad07f16097106a9c2c6a2.tar.gz
linux-975b91bb17e70c0dc33ad07f16097106a9c2c6a2.tar.bz2
linux-975b91bb17e70c0dc33ad07f16097106a9c2c6a2.zip
Bluetooth: Use standard HCI cmd timeout for RESET
Remove magic and use standard HCI cmd timeout Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth')
-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 08994ecc3b6a..471e4fb1b6e5 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -783,7 +783,7 @@ static int hci_dev_do_close(struct hci_dev *hdev)
test_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks)) {
set_bit(HCI_INIT, &hdev->flags);
__hci_request(hdev, hci_reset_req, 0,
- msecs_to_jiffies(250));
+ msecs_to_jiffies(HCI_CMD_TIMEOUT));
clear_bit(HCI_INIT, &hdev->flags);
}