diff options
author | Christophe Ricard <christophe.ricard@gmail.com> | 2014-09-13 04:28:52 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2014-09-23 20:02:24 -0400 |
commit | 459e794b9b1e0c6be93745344c40364296e7aacd (patch) | |
tree | adff2ec56743a7bfd55d153791449396f38a1f62 /drivers/nfc | |
parent | bc6b8275924b8af3d10ac35df0579d94fa169680 (diff) |
NFC: st21nfca: ERR_PTR vs NULL fix
"skb" can be NULL here but it can't be an ERR_PTR:
- IS_ERR(NULL) return false and skb migth be NULL.
- skb cannot be a ERR_PTR as nfc_hci_send_cmd_async it never using such cast.
!skb is more appropriate at those places.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r-- | drivers/nfc/st21nfca/st21nfca_dep.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nfc/st21nfca/st21nfca_dep.c b/drivers/nfc/st21nfca/st21nfca_dep.c index bf3132ba743c..9408122fb948 100644 --- a/drivers/nfc/st21nfca/st21nfca_dep.c +++ b/drivers/nfc/st21nfca/st21nfca_dep.c | |||
@@ -443,7 +443,7 @@ static void st21nfca_im_recv_atr_res_cb(void *context, struct sk_buff *skb, | |||
443 | if (err != 0) | 443 | if (err != 0) |
444 | return; | 444 | return; |
445 | 445 | ||
446 | if (IS_ERR(skb)) | 446 | if (!skb) |
447 | return; | 447 | return; |
448 | 448 | ||
449 | switch (info->async_cb_type) { | 449 | switch (info->async_cb_type) { |
@@ -555,7 +555,7 @@ static void st21nfca_im_recv_dep_res_cb(void *context, struct sk_buff *skb, | |||
555 | if (err != 0) | 555 | if (err != 0) |
556 | return; | 556 | return; |
557 | 557 | ||
558 | if (IS_ERR(skb)) | 558 | if (!skb) |
559 | return; | 559 | return; |
560 | 560 | ||
561 | switch (info->async_cb_type) { | 561 | switch (info->async_cb_type) { |