---

yaml --- r: 314203 b: refs/heads/master c: 5e50ee3 h: refs/heads/master i: 314201: e58bd9b 314199: 3b1bb57 v: v3
git-mirror · Jun 4, 2012 · 73bbe60 · 73bbe60
1 parent 633a0b9
commit 73bbe60
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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)