aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorArron Wang <arron.wang@intel.com>2013-04-22 05:21:27 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2013-06-13 18:18:58 -0400
commita69bdc1ecd032fda1bc808fa0e1634bbc9417ad5 (patch)
treeb5e068f94d926ff6e4109c91575e7ac09aca40ea /drivers
parent9c59844005c22700b36dcdbafeea7956b7f4b174 (diff)
NFC: pn544: Remove Felica and Jewel device presence check
There is no builtin command for driver to check the presence of Felica and Jewel device, it is more reasonable for the userspace daemon neard to build seperate commands to check the presence of the card. Signed-off-by: Arron Wang <arron.wang@intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/nfc/pn544/pn544.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/nfc/pn544/pn544.c b/drivers/nfc/pn544/pn544.c
index 0963de2f6ab0..84b5168b603c 100644
--- a/drivers/nfc/pn544/pn544.c
+++ b/drivers/nfc/pn544/pn544.c
@@ -711,12 +711,9 @@ static int pn544_hci_check_presence(struct nfc_hci_dev *hdev,
711 return nfc_hci_send_cmd(hdev, NFC_HCI_RF_READER_A_GATE, 711 return nfc_hci_send_cmd(hdev, NFC_HCI_RF_READER_A_GATE,
712 PN544_RF_READER_CMD_ACTIVATE_NEXT, 712 PN544_RF_READER_CMD_ACTIVATE_NEXT,
713 target->nfcid1, target->nfcid1_len, NULL); 713 target->nfcid1, target->nfcid1_len, NULL);
714 } else if (target->supported_protocols & NFC_PROTO_JEWEL_MASK) { 714 } else if (target->supported_protocols & (NFC_PROTO_JEWEL_MASK |
715 return nfc_hci_send_cmd(hdev, target->hci_reader_gate, 715 NFC_PROTO_FELICA_MASK)) {
716 PN544_JEWEL_RAW_CMD, NULL, 0, NULL); 716 return -EOPNOTSUPP;
717 } else if (target->supported_protocols & NFC_PROTO_FELICA_MASK) {
718 return nfc_hci_send_cmd(hdev, PN544_RF_READER_F_GATE,
719 PN544_FELICA_RAW, NULL, 0, NULL);
720 } else if (target->supported_protocols & NFC_PROTO_NFC_DEP_MASK) { 717 } else if (target->supported_protocols & NFC_PROTO_NFC_DEP_MASK) {
721 return nfc_hci_send_cmd(hdev, target->hci_reader_gate, 718 return nfc_hci_send_cmd(hdev, target->hci_reader_gate,
722 PN544_HCI_CMD_ATTREQUEST, 719 PN544_HCI_CMD_ATTREQUEST,