summaryrefslogtreecommitdiff
path: root/drivers/nfc
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2012-03-05 01:03:46 +0100
committerJohn W. Linville <linville@tuxdriver.com>2012-03-06 15:16:22 -0500
commitd8dc107248d336695ca6a964c5ffdc2f4d160a04 (patch)
tree3efb1bebfc0d03e44402043ad0648e59b92ff07f /drivers/nfc
parent7975754f61b8e87ad0b34509a94c54c8d19ea15d (diff)
downloadlinux-3.10-d8dc107248d336695ca6a964c5ffdc2f4d160a04.tar.gz
linux-3.10-d8dc107248d336695ca6a964c5ffdc2f4d160a04.tar.bz2
linux-3.10-d8dc107248d336695ca6a964c5ffdc2f4d160a04.zip
NFC: Export Jewel/Topaz ID from pn533
The jewel ID is the NFCID1 for Topaz NFC tags. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/pn533.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c
index 353bab775d7..f5da5ae67ec 100644
--- a/drivers/nfc/pn533.c
+++ b/drivers/nfc/pn533.c
@@ -828,6 +828,8 @@ static int pn533_target_found_jewel(struct nfc_target *nfc_tgt, u8 *tgt_data,
nfc_tgt->supported_protocols = NFC_PROTO_JEWEL_MASK;
nfc_tgt->sens_res = be16_to_cpu(tgt_jewel->sens_res);
+ nfc_tgt->nfcid1_len = 4;
+ memcpy(nfc_tgt->nfcid1, tgt_jewel->jewelid, nfc_tgt->nfcid1_len);
return 0;
}