]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
NFC: Move the nfcwilink dereference below the NULL test
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Sat, 8 Sep 2012 01:53:22 +0000 (09:53 +0800)
committerSamuel Ortiz <sameo@linux.intel.com>
Mon, 24 Sep 2012 22:17:26 +0000 (00:17 +0200)
spatch with a semantic match is used to found this.
(http://coccinelle.lip6.fr/)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/nfc/nfcwilink.c

index 827f039ceaf5465b3700bd9fdc0cc31f564bea07..50b1ee41afc60e2a3789f1a4e26ab12ff811ce4e 100644 (file)
@@ -352,8 +352,6 @@ static long nfcwilink_receive(void *priv_data, struct sk_buff *skb)
        struct nfcwilink *drv = priv_data;
        int rc;
 
-       nfc_dev_dbg(&drv->pdev->dev, "receive entry, len %d", skb->len);
-
        if (!skb)
                return -EFAULT;
 
@@ -362,6 +360,8 @@ static long nfcwilink_receive(void *priv_data, struct sk_buff *skb)
                return -EFAULT;
        }
 
+       nfc_dev_dbg(&drv->pdev->dev, "receive entry, len %d", skb->len);
+
        /* strip the ST header
        (apart for the chnl byte, which is not received in the hdr) */
        skb_pull(skb, (NFCWILINK_HDR_LEN-1));