---

yaml --- r: 284315 b: refs/heads/master c: b5b32b6 h: refs/heads/master i: 284313: 8cc081b 284311: ad41423 v: v3
git-mirror · Jan 3, 2012 · 366c3f6 · 366c3f6
1 parent 5c612bd
commit 366c3f6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59e294065ddee7074af91e4f5e12e6095eb1135b
+refs/heads/master: b5b32b653dedb29eb95e57cbbaefc4abf7141cb2
diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c
@@ -711,7 +711,14 @@ static void hci_cc_read_local_ext_features(struct hci_dev *hdev,
 	if (rp->status)
 		return;
 
-	memcpy(hdev->host_features, rp->features, 8);
+	switch (rp->page) {
+	case 0:
+		memcpy(hdev->features, rp->features, 8);
+		break;
+	case 1:
+		memcpy(hdev->host_features, rp->features, 8);
+		break;
+	}
 
 	hci_req_complete(hdev, HCI_OP_READ_LOCAL_EXT_FEATURES, rp->status);
 }