diff options
Diffstat (limited to 'drivers')
-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 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, |