From: Samuel Ortiz <sameo@linux.intel.com>
Date: Thu, 31 May 2012 09:48:58 +0000 (+0200)
Subject: NFC: Switch to Initiator mode when getting NFC_ATTR_PROTOCOLS
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5e50ee3ae6e465be89dd0a66f78c3211a412d595;p=linux.git

NFC: Switch to Initiator mode when getting NFC_ATTR_PROTOCOLS

That is needed for keeping backward compatibility with apps using the old
netlink polling API (NFC_ATTR_PROTOCOLS instead of NFC_ATTR_IM_PROTOCOLS).

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---

diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
index 21eaa9b5c6bfa..03c31db38f128 100644
--- a/net/nfc/netlink.c
+++ b/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)