summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorThierry Escande <thierry.escande@linux.intel.com>2014-01-02 11:58:13 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2014-01-04 03:35:34 +0100
commit67af1d7a0fb4b5397cb093c0fe98d5b95516c228 (patch)
tree8422b34f34049f7d080bd251018f73b7b2983cb5 /net/nfc
parent444fb98eed98f7292a83f9bf123d1c78f171327e (diff)
downloadlinux-67af1d7a0fb4b5397cb093c0fe98d5b95516c228.tar.gz
linux-67af1d7a0fb4b5397cb093c0fe98d5b95516c228.tar.bz2
linux-67af1d7a0fb4b5397cb093c0fe98d5b95516c228.zip
NFC: digital: Fix incorrect use of ERR_PTR and PTR_ERR macros
It's bad to use these macros when not dealing with error code. this patch changes calls to these macros with correct casts. Signed-off-by: Thierry Escande <thierry.escande@linux.intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/digital_dep.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/nfc/digital_dep.c b/net/nfc/digital_dep.c
index 07bbc24fb4c7..e42ecb66e712 100644
--- a/net/nfc/digital_dep.c
+++ b/net/nfc/digital_dep.c
@@ -472,7 +472,7 @@ int digital_tg_send_dep_res(struct nfc_digital_dev *ddev, struct sk_buff *skb)
static void digital_tg_send_psl_res_complete(struct nfc_digital_dev *ddev,
void *arg, struct sk_buff *resp)
{
- u8 rf_tech = PTR_ERR(arg);
+ u8 rf_tech = (unsigned long)arg;
if (IS_ERR(resp))
return;
@@ -508,7 +508,7 @@ static int digital_tg_send_psl_res(struct nfc_digital_dev *ddev, u8 did,
ddev->skb_add_crc(skb);
rc = digital_tg_send_cmd(ddev, skb, 0, digital_tg_send_psl_res_complete,
- ERR_PTR(rf_tech));
+ (void *)(unsigned long)rf_tech);
if (rc)
kfree_skb(skb);