aboutsummaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorArron Wang <arron.wang@intel.com>2012-09-27 05:32:56 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-10-26 12:26:45 -0400
commit928326f2237d2dd62b2fb9374c655cd906549868 (patch)
tree7ea03fcbcf40317ccb3cf0258be1323c197238c5 /net/nfc
parentf7a5f6c532f33ba66a7ca19e81ed447a83dab2db (diff)
NFC: Handle pn544 continue activation
We need to send continue activation command to allow NFCIP-1 activation when a NFC target has been discovered in type A or type F reader gate. Signed-off-by: Arron Wang <arron.wang@intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/hci/core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c
index 8a9a811b558a..052a0a27ac1a 100644
--- a/net/nfc/hci/core.c
+++ b/net/nfc/hci/core.c
@@ -263,7 +263,9 @@ int nfc_hci_target_discovered(struct nfc_hci_dev *hdev, u8 gate)
263 break; 263 break;
264 } 264 }
265 265
266 targets->hci_reader_gate = gate; 266 /* if driver set the new gate, we will skip the old one */
267 if (targets->hci_reader_gate == 0x00)
268 targets->hci_reader_gate = gate;
267 269
268 r = nfc_targets_found(hdev->ndev, targets, 1); 270 r = nfc_targets_found(hdev->ndev, targets, 1);
269 271