From 6672a11640c282e1d289b631337f4a058b0b1d79 Mon Sep 17 00:00:00 2001
From: Ville Tervo <ville.tervo@nokia.com>
Date: Fri, 27 May 2011 11:16:21 +0300
Subject: [PATCH] --- yaml --- r: 253871 b: refs/heads/master c:
 7f4f0572df6c8eaa6a587bc212b0806ff37380dd h: refs/heads/master i:   253869:
 0b947dd5a702124363f57d17d44b1b3c98709314   253867:
 49fadeb90bddfeb9832e4e67dcb42473287e52ee   253863:
 9b0061aac2cbb95b0cb9cb2270ddf24e95d23b40   253855:
 c6ec3d6ef2c8f748f0f7d70f881c05c41b06ea9d v: v3

---
 [refs]                          |  2 +-
 trunk/net/bluetooth/hci_event.c | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 5f5ecbf16ee2..18efcc292a7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26e7acf315ba5fc5ac4e7cbdb422a345e59898bd
+refs/heads/master: 7f4f0572df6c8eaa6a587bc212b0806ff37380dd
diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c
index f13ddbf858ba..77930aa522e3 100644
--- a/trunk/net/bluetooth/hci_event.c
+++ b/trunk/net/bluetooth/hci_event.c
@@ -477,14 +477,16 @@ static void hci_setup_event_mask(struct hci_dev *hdev)
 	 * command otherwise */
 	u8 events[8] = { 0xff, 0xff, 0xfb, 0xff, 0x00, 0x00, 0x00, 0x00 };
 
-	/* Events for 1.2 and newer controllers */
-	if (hdev->lmp_ver > 1) {
-		events[4] |= 0x01; /* Flow Specification Complete */
-		events[4] |= 0x02; /* Inquiry Result with RSSI */
-		events[4] |= 0x04; /* Read Remote Extended Features Complete */
-		events[5] |= 0x08; /* Synchronous Connection Complete */
-		events[5] |= 0x10; /* Synchronous Connection Changed */
-	}
+	/* CSR 1.1 dongles does not accept any bitfield so don't try to set
+	 * any event mask for pre 1.2 devices */
+	if (hdev->lmp_ver <= 1)
+		return;
+
+	events[4] |= 0x01; /* Flow Specification Complete */
+	events[4] |= 0x02; /* Inquiry Result with RSSI */
+	events[4] |= 0x04; /* Read Remote Extended Features Complete */
+	events[5] |= 0x08; /* Synchronous Connection Complete */
+	events[5] |= 0x10; /* Synchronous Connection Changed */
 
 	if (hdev->features[3] & LMP_RSSI_INQ)
 		events[4] |= 0x04; /* Inquiry Result with RSSI */