diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-02-20 14:47:17 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-02-20 14:47:17 -0500 |
commit | 9d4990a260ce395493848640bed94fb55f440f10 (patch) | |
tree | ab6505e7c7420234575df3f4451f4da0ac38e6dd /net/bluetooth/hci_core.c | |
parent | 64f0a836f600e9c31ffd511713ab5d328aa96ac8 (diff) | |
parent | 2504a6423b9ab4c36df78227055995644de19edb (diff) | |
download | linux-9d4990a260ce395493848640bed94fb55f440f10.tar.gz linux-9d4990a260ce395493848640bed94fb55f440f10.tar.bz2 linux-9d4990a260ce395493848640bed94fb55f440f10.zip |
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 9de93714213a..5aeb62491198 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -640,7 +640,8 @@ static int hci_dev_do_close(struct hci_dev *hdev) /* Reset device */ skb_queue_purge(&hdev->cmd_q); atomic_set(&hdev->cmd_cnt, 1); - if (!test_bit(HCI_RAW, &hdev->flags)) { + if (!test_bit(HCI_RAW, &hdev->flags) && + test_bit(HCI_QUIRK_NO_RESET, &hdev->quirks)) { set_bit(HCI_INIT, &hdev->flags); __hci_request(hdev, hci_reset_req, 0, msecs_to_jiffies(250)); |