diff --git a/[refs] b/[refs]
index efefc33ff860..e8b2d7e6e2de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e57d758ae8e8f00e80f233c823aeeef34bd92796
+refs/heads/master: b3ff53ff006b7906c88adf9d0fccc06a8877fae1
diff --git a/trunk/net/bluetooth/smp.c b/trunk/net/bluetooth/smp.c
index 8f56282c247d..9883d673873c 100644
--- a/trunk/net/bluetooth/smp.c
+++ b/trunk/net/bluetooth/smp.c
@@ -310,7 +310,7 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth,
 			remote_io > SMP_IO_KEYBOARD_DISPLAY)
 		method = JUST_WORKS;
 	else
-		method = gen_method[local_io][remote_io];
+		method = gen_method[remote_io][local_io];
 
 	/* If not bonding, don't ask user to confirm a Zero TK */
 	if (!(auth & SMP_AUTH_BONDING) && method == JUST_CFM)