summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-09-08 09:53:22 +0800
committerSamuel Ortiz <sameo@linux.intel.com>2012-09-25 00:17:26 +0200
commitd6650a2ccfdcf536841c2f880a1a6f19fce2e3a1 (patch)
treefa6e52465a0d2f6e0ebc08d9dddd57e05474b37c
parentf4f20d0650e9cd13f65b5e7f93af126b526af721 (diff)
downloadlinux-3.10-d6650a2ccfdcf536841c2f880a1a6f19fce2e3a1.tar.gz
linux-3.10-d6650a2ccfdcf536841c2f880a1a6f19fce2e3a1.tar.bz2
linux-3.10-d6650a2ccfdcf536841c2f880a1a6f19fce2e3a1.zip
NFC: Move the nfcwilink dereference below the NULL test
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>
-rw-r--r--drivers/nfc/nfcwilink.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
index 827f039ceaf..50b1ee41afc 100644
--- a/drivers/nfc/nfcwilink.c
+++ b/drivers/nfc/nfcwilink.c
@@ -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));