aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-09-07 21:53:22 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-09-24 18:17:26 -0400
commitd6650a2ccfdcf536841c2f880a1a6f19fce2e3a1 (patch)
treefa6e52465a0d2f6e0ebc08d9dddd57e05474b37c /drivers/nfc
parentf4f20d0650e9cd13f65b5e7f93af126b526af721 (diff)
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>
Diffstat (limited to 'drivers/nfc')
-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 827f039ceaf5..50b1ee41afc6 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)
352 struct nfcwilink *drv = priv_data; 352 struct nfcwilink *drv = priv_data;
353 int rc; 353 int rc;
354 354
355 nfc_dev_dbg(&drv->pdev->dev, "receive entry, len %d", skb->len);
356
357 if (!skb) 355 if (!skb)
358 return -EFAULT; 356 return -EFAULT;
359 357
@@ -362,6 +360,8 @@ static long nfcwilink_receive(void *priv_data, struct sk_buff *skb)
362 return -EFAULT; 360 return -EFAULT;
363 } 361 }
364 362
363 nfc_dev_dbg(&drv->pdev->dev, "receive entry, len %d", skb->len);
364
365 /* strip the ST header 365 /* strip the ST header
366 (apart for the chnl byte, which is not received in the hdr) */ 366 (apart for the chnl byte, which is not received in the hdr) */
367 skb_pull(skb, (NFCWILINK_HDR_LEN-1)); 367 skb_pull(skb, (NFCWILINK_HDR_LEN-1));