diff options
| author | Arron Wang <arron.wang@intel.com> | 2013-04-22 16:08:05 +0800 |
|---|---|---|
| committer | Arron Wang <arron.wang@intel.com> | 2013-04-24 15:06:42 +0800 |
| commit | c247784192950388a941e510d03c5d46115b0359 (patch) | |
| tree | 2c9b5fb138f48ec436cd33498fb64e9e599edae6 | |
| parent | d32b15bf7037446db1d20a027e523212c5cad910 (diff) | |
| download | kernel-mfld-blackbay-c247784192950388a941e510d03c5d46115b0359.tar.gz kernel-mfld-blackbay-c247784192950388a941e510d03c5d46115b0359.tar.bz2 kernel-mfld-blackbay-c247784192950388a941e510d03c5d46115b0359.zip | |
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
Change-Id: I5fe041a66a6f09ea88e2fd88949390f8aa1acc9c
Signed-off-by: Arron Wang <arron.wang@intel.com>
| -rw-r--r-- | drivers/nfc/pn544/pn544.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/nfc/pn544/pn544.c b/drivers/nfc/pn544/pn544.c index 7f363461fc5..5ec450db492 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, return nfc_hci_send_cmd(hdev, NFC_HCI_RF_READER_A_GATE, PN544_RF_READER_CMD_ACTIVATE_NEXT, target->nfcid1, target->nfcid1_len, NULL); - } else if (target->supported_protocols & NFC_PROTO_JEWEL_MASK) { - return nfc_hci_send_cmd(hdev, target->hci_reader_gate, - PN544_JEWEL_RAW_CMD, NULL, 0, NULL); - } else if (target->supported_protocols & NFC_PROTO_FELICA_MASK) { - return nfc_hci_send_cmd(hdev, PN544_RF_READER_F_GATE, - PN544_FELICA_RAW, NULL, 0, NULL); + } else if (target->supported_protocols & (NFC_PROTO_JEWEL_MASK | + NFC_PROTO_FELICA_MASK)) { + return -EOPNOTSUPP; } else if (target->supported_protocols & NFC_PROTO_NFC_DEP_MASK) { return nfc_hci_send_cmd(hdev, target->hci_reader_gate, PN544_HCI_CMD_ATTREQUEST, |