---

yaml --- r: 290911 b: refs/heads/master c: 7a7f1e7 h: refs/heads/master i: 290909: fd97a50 290907: 0dc1f56 290903: 4964dbe 290895: 37c2fd3 290879: 7835871 v: v3
git-mirror · Feb 13, 2012 · f7fbdf4 · f7fbdf4
1 parent 4d31c71
commit f7fbdf4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7d05bad1c10a363b6b99f66ac1fa76b6892e618
+refs/heads/master: 7a7f1e7c857959f5298020969741e389f21edbae
diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c
@@ -2965,7 +2965,10 @@ static inline void hci_io_capa_request_evt(struct hci_dev *hdev, struct sk_buff
 		struct hci_cp_io_capability_reply cp;
 
 		bacpy(&cp.bdaddr, &ev->bdaddr);
-		cp.capability = conn->io_capability;
+		/* Change the IO capability from KeyboardDisplay
+		 * to DisplayYesNo as it is not supported by BT spec. */
+		cp.capability = (conn->io_capability == 0x04) ?
+						0x01 : conn->io_capability;
 		conn->auth_type = hci_get_auth_req(conn);
 		cp.authentication = conn->auth_type;