diff --git a/[refs] b/[refs]
index 6c628ae6bf70..2768b3bb515b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56af2568c27ee697a5a34cf037e3253e7b77e80b
+refs/heads/master: 5e50ee3ae6e465be89dd0a66f78c3211a412d595
diff --git a/trunk/net/nfc/netlink.c b/trunk/net/nfc/netlink.c
index 21eaa9b5c6bf..03c31db38f12 100644
--- a/trunk/net/nfc/netlink.c
+++ b/trunk/net/nfc/netlink.c
@@ -597,11 +597,11 @@ static int nfc_genl_start_poll(struct sk_buff *skb, struct genl_info *info)
 
 	if (info->attrs[NFC_ATTR_TM_PROTOCOLS])
 		tm_protocols = nla_get_u32(info->attrs[NFC_ATTR_TM_PROTOCOLS]);
-	else if (info->attrs[NFC_ATTR_PROTOCOLS])
-		tm_protocols = nla_get_u32(info->attrs[NFC_ATTR_PROTOCOLS]);
 
 	if (info->attrs[NFC_ATTR_IM_PROTOCOLS])
 		im_protocols = nla_get_u32(info->attrs[NFC_ATTR_IM_PROTOCOLS]);
+	else if (info->attrs[NFC_ATTR_PROTOCOLS])
+		im_protocols = nla_get_u32(info->attrs[NFC_ATTR_PROTOCOLS]);
 
 	dev = nfc_get_device(idx);
 	if (!dev)