diff --git a/[refs] b/[refs]
index ec7fb34758b5..caa6ece2aa23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12adcf3a953c3aa4006d855aa638133bf018ceac
+refs/heads/master: 655fe6ece7e71b37c17577ae485d11bf701c95f7
diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c
index 2ac6036b70c3..59ca4755b6b3 100644
--- a/trunk/net/bluetooth/hci_core.c
+++ b/trunk/net/bluetooth/hci_core.c
@@ -1083,8 +1083,11 @@ int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key,
 	 * previous key */
 	if (type == HCI_LK_CHANGED_COMBINATION &&
 					(!conn || conn->remote_auth == 0xff) &&
-					old_key_type == 0xff)
+					old_key_type == 0xff) {
 		type = HCI_LK_COMBINATION;
+		if (conn)
+			conn->key_type = type;
+	}
 
 	if (new_key && !hci_persistent_key(hdev, conn, type, old_key_type)) {
 		list_del(&key->list);