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

Commit 23f7e6d0 authored by Eric Lapuyade's avatar Eric Lapuyade Committed by Samuel Ortiz
Browse files

NFC: Ignore err when chip doesn't implement HW/SW info registers 



NFC_HCI_ID_MGMT_VERSION_SW and NFC_HCI_ID_MGMT_VERSION_HW are optional
registers for gate NFC_HCI_ID_MGMT_GATE in standard HCI. When chip
doesn't implement, just leave all the information as zeros.

Signed-off-by: default avatarEric Lapuyade <eric.lapuyade@intel.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 07887e92

net/nfc/hci/core.c

+6 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ static int nfc_hci_result_to_errno(u8 result) 
	switch (result) {

	case NFC_HCI_ANY_OK:

		return 0;

	case NFC_HCI_ANY_E_REG_PAR_UNKNOWN:

		return -EOPNOTSUPP;

	case NFC_HCI_ANY_E_TIMEOUT:

		return -ETIME;

	default:
@@ -419,6 +421,10 @@ static int hci_dev_version(struct nfc_hci_dev *hdev) 


	r = nfc_hci_get_param(hdev, NFC_HCI_ID_MGMT_GATE,

			      NFC_HCI_ID_MGMT_VERSION_SW, &skb);

	if (r == -EOPNOTSUPP) {

		pr_info("Software/Hardware info not available\n");

		return 0;

	}

	if (r < 0)

		return r;