From 73bbe601ddaa1c1da09e33c9c5256daf7cd23002 Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Thu, 31 May 2012 11:48:58 +0200 Subject: [PATCH] --- yaml --- r: 314203 b: refs/heads/master c: 5e50ee3ae6e465be89dd0a66f78c3211a412d595 h: refs/heads/master i: 314201: e58bd9bbf8066dd1282fbe56424eaa65a0bebc60 314199: 3b1bb575c2291b75337bc2feccd55d8aeae00b10 v: v3 --- [refs] | 2 +- trunk/net/nfc/netlink.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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)