summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2012-07-03 23:45:26 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-07-09 16:42:23 -0400
commita1fbbf1817c671a396b7ae3832bdfab63acea2e5 (patch)
treea41b63e510813fb10e2a4f7cfe5d3f823ee1f257 /drivers/nfc
parent5c7b0531299dad4255ff5c5106d060150cda75a4 (diff)
downloadlinux-a1fbbf1817c671a396b7ae3832bdfab63acea2e5.tar.bz2
NFC: Use communicate thru only for PaSoRi when trying to read Felica tags
Otherwise DATA_EXCHANGE seems to be just fine. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/pn533.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c
index 37786ff18c36..84d8175db818 100644
--- a/drivers/nfc/pn533.c
+++ b/drivers/nfc/pn533.c
@@ -1806,7 +1806,17 @@ static int pn533_build_tx_frame(struct pn533 *dev, struct sk_buff *skb,
if (target == true) {
switch (dev->device_type) {
- case PN533_DEVICE_STD:
+ case PN533_DEVICE_PASORI:
+ if (dev->tgt_active_prot == NFC_PROTO_FELICA) {
+ skb_push(skb, PN533_CMD_DATAEXCH_HEAD_LEN - 1);
+ out_frame = (struct pn533_frame *) skb->data;
+ pn533_tx_frame_init(out_frame,
+ PN533_CMD_IN_COMM_THRU);
+
+ break;
+ }
+
+ default:
skb_push(skb, PN533_CMD_DATAEXCH_HEAD_LEN);
out_frame = (struct pn533_frame *) skb->data;
pn533_tx_frame_init(out_frame,
@@ -1815,19 +1825,8 @@ static int pn533_build_tx_frame(struct pn533 *dev, struct sk_buff *skb,
memcpy(PN533_FRAME_CMD_PARAMS_PTR(out_frame),
&tg, sizeof(u8));
out_frame->datalen += sizeof(u8);
- break;
-
- case PN533_DEVICE_PASORI:
- skb_push(skb, PN533_CMD_DATAEXCH_HEAD_LEN - 1);
- out_frame = (struct pn533_frame *) skb->data;
- pn533_tx_frame_init(out_frame, PN533_CMD_IN_COMM_THRU);
break;
-
- default:
- nfc_dev_err(&dev->interface->dev,
- "Unknown device type %d", dev->device_type);
- return -EINVAL;
}
} else {