diff options
Diffstat (limited to 'drivers/nfc/pn544_hci.c')
-rw-r--r-- | drivers/nfc/pn544_hci.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/nfc/pn544_hci.c b/drivers/nfc/pn544_hci.c index 281f18c2fb82..457eac35dc74 100644 --- a/drivers/nfc/pn544_hci.c +++ b/drivers/nfc/pn544_hci.c | |||
@@ -576,7 +576,8 @@ static int pn544_hci_xmit(struct nfc_shdlc *shdlc, struct sk_buff *skb) | |||
576 | return pn544_hci_i2c_write(client, skb->data, skb->len); | 576 | return pn544_hci_i2c_write(client, skb->data, skb->len); |
577 | } | 577 | } |
578 | 578 | ||
579 | static int pn544_hci_start_poll(struct nfc_shdlc *shdlc, u32 protocols) | 579 | static int pn544_hci_start_poll(struct nfc_shdlc *shdlc, |
580 | u32 im_protocols, u32 tm_protocols) | ||
580 | { | 581 | { |
581 | struct nfc_hci_dev *hdev = nfc_shdlc_get_hci_dev(shdlc); | 582 | struct nfc_hci_dev *hdev = nfc_shdlc_get_hci_dev(shdlc); |
582 | u8 phases = 0; | 583 | u8 phases = 0; |
@@ -584,7 +585,8 @@ static int pn544_hci_start_poll(struct nfc_shdlc *shdlc, u32 protocols) | |||
584 | u8 duration[2]; | 585 | u8 duration[2]; |
585 | u8 activated; | 586 | u8 activated; |
586 | 587 | ||
587 | pr_info(DRIVER_DESC ": %s protocols = %d\n", __func__, protocols); | 588 | pr_info(DRIVER_DESC ": %s protocols 0x%x 0x%x\n", |
589 | __func__, im_protocols, tm_protocols); | ||
588 | 590 | ||
589 | r = nfc_hci_send_event(hdev, NFC_HCI_RF_READER_A_GATE, | 591 | r = nfc_hci_send_event(hdev, NFC_HCI_RF_READER_A_GATE, |
590 | NFC_HCI_EVT_END_OPERATION, NULL, 0); | 592 | NFC_HCI_EVT_END_OPERATION, NULL, 0); |
@@ -604,10 +606,10 @@ static int pn544_hci_start_poll(struct nfc_shdlc *shdlc, u32 protocols) | |||
604 | if (r < 0) | 606 | if (r < 0) |
605 | return r; | 607 | return r; |
606 | 608 | ||
607 | if (protocols & (NFC_PROTO_ISO14443_MASK | NFC_PROTO_MIFARE_MASK | | 609 | if (im_protocols & (NFC_PROTO_ISO14443_MASK | NFC_PROTO_MIFARE_MASK | |
608 | NFC_PROTO_JEWEL_MASK)) | 610 | NFC_PROTO_JEWEL_MASK)) |
609 | phases |= 1; /* Type A */ | 611 | phases |= 1; /* Type A */ |
610 | if (protocols & NFC_PROTO_FELICA_MASK) { | 612 | if (im_protocols & NFC_PROTO_FELICA_MASK) { |
611 | phases |= (1 << 2); /* Type F 212 */ | 613 | phases |= (1 << 2); /* Type F 212 */ |
612 | phases |= (1 << 3); /* Type F 424 */ | 614 | phases |= (1 << 3); /* Type F 424 */ |
613 | } | 615 | } |