Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a69bdc1ecd032fda1bc808fa0e1634bbc9417ad5

Authored by Arron Wang
Committed by Samuel Ortiz
1 parent 9c59844005
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 3 additions and 6 deletions Side-by-side Diff

drivers/nfc/pn544/pn544.c
Diff comments   View file @ a69bdc1
... ... @@ -711,12 +711,9 @@
711 711 return nfc_hci_send_cmd(hdev, NFC_HCI_RF_READER_A_GATE,
712 712 PN544_RF_READER_CMD_ACTIVATE_NEXT,
713 713 target->nfcid1, target->nfcid1_len, NULL);
714   - } else if (target->supported_protocols & NFC_PROTO_JEWEL_MASK) {
715   - return nfc_hci_send_cmd(hdev, target->hci_reader_gate,
716   - PN544_JEWEL_RAW_CMD, NULL, 0, NULL);
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);
  714 + } else if (target->supported_protocols & (NFC_PROTO_JEWEL_MASK |
  715 + NFC_PROTO_FELICA_MASK)) {
  716 + return -EOPNOTSUPP;
720 717 } else if (target->supported_protocols & NFC_PROTO_NFC_DEP_MASK) {
721 718 return nfc_hci_send_cmd(hdev, target->hci_reader_gate,
722 719 PN544_HCI_CMD_ATTREQUEST,