summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorThierry Escande <thierry.escande@linux.intel.com>2013-02-05 10:08:35 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2013-02-08 12:18:48 +0100
commit52f2eaeec11c16c219f0e99b8496fbba86889830 (patch)
treecb8ef808d93ebedf8881f1c9e783fccdc95d65af /drivers/nfc
parente0af11fa0df30bc645e6abb4d3ddc7ed05af0451 (diff)
downloadlinux-stable-52f2eaeec11c16c219f0e99b8496fbba86889830.tar.gz
linux-stable-52f2eaeec11c16c219f0e99b8496fbba86889830.tar.bz2
linux-stable-52f2eaeec11c16c219f0e99b8496fbba86889830.zip
NFC: pn533: Fix target polling mode
Remove unneeded bitwise OR operator on uninitialized sk_buff data Signed-off-by: Thierry Escande <thierry.escande@linux.intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/pn533.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c
index bd5c41b481d3..f0f6763d67ae 100644
--- a/drivers/nfc/pn533.c
+++ b/drivers/nfc/pn533.c
@@ -1378,7 +1378,7 @@ static struct sk_buff *pn533_alloc_poll_tg_frame(struct pn533 *dev)
return NULL;
/* DEP support only */
- *skb_put(skb, 1) |= PN533_INIT_TARGET_DEP;
+ *skb_put(skb, 1) = PN533_INIT_TARGET_DEP;
/* MIFARE params */
memcpy(skb_put(skb, 6), mifare_params, 6);