From 6e2c854291833df4389f1650280c796b4f14a9c7 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Fri, 3 Feb 2012 21:29:40 +0200
Subject: [PATCH] --- yaml --- r: 287962 b: refs/heads/master c:
 ca0d6c7ece0e78268cd7c5c378d6b1b610625085 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/net/bluetooth/hci_core.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index db9d953836b7..058ad93df0e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf33e77b76d7439f21a23a94eab4ab3b405a6a7d
+refs/heads/master: ca0d6c7ece0e78268cd7c5c378d6b1b610625085
diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c
index 9de93714213a..5aeb62491198 100644
--- a/trunk/net/bluetooth/hci_core.c
+++ b/trunk/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));