Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81b30395 authored by Eric Lapuyade's avatar Eric Lapuyade Committed by John W. Linville
Browse files

NFC: Set target nfcid1 for all HCI reader A targets 



Without the discovered target nfcid1 and its length set properly, type 2
tags detection fails with the pn544 as it checks for them from
pn544_hci_complete_target_discovered().

Signed-off-by: default avatarEric Lapuyade <eric.lapuyade@intel.com>
Reported-by: default avatarMathias Jeppsson <mathias.jeppsson@sonymobile.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fe020120

net/nfc/hci/core.c

+15 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ static int nfc_hci_target_discovered(struct nfc_hci_dev *hdev, u8 gate) 
	struct nfc_target *targets;

	struct sk_buff *atqa_skb = NULL;

	struct sk_buff *sak_skb = NULL;

	struct sk_buff *uid_skb = NULL;

	int r;



	pr_debug("from gate %d\n", gate);
@@ -205,6 +206,19 @@ static int nfc_hci_target_discovered(struct nfc_hci_dev *hdev, u8 gate) 
		targets->sens_res = be16_to_cpu(*(u16 *)atqa_skb->data);

		targets->sel_res = sak_skb->data[0];



		r = nfc_hci_get_param(hdev, NFC_HCI_RF_READER_A_GATE,

				      NFC_HCI_RF_READER_A_UID, &uid_skb);

		if (r < 0)

			goto exit;



		if (uid_skb->len == 0 || uid_skb->len > NFC_NFCID1_MAXSIZE) {

			r = -EPROTO;

			goto exit;

		}



		memcpy(targets->nfcid1, uid_skb->data, uid_skb->len);

		targets->nfcid1_len = uid_skb->len;



		if (hdev->ops->complete_target_discovered) {

			r = hdev->ops->complete_target_discovered(hdev, gate,

								  targets);
@@ -240,6 +254,7 @@ static int nfc_hci_target_discovered(struct nfc_hci_dev *hdev, u8 gate) 
	kfree(targets);

	kfree_skb(atqa_skb);

	kfree_skb(sak_skb);

	kfree_skb(uid_skb);



	return r;

}