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

Commit 3f89fea3 authored by Thierry Escande's avatar Thierry Escande Committed by Samuel Ortiz
Browse files

NFC: digital: Rework error handling in DEP_RES response 



The Digital Protocol stack used to send a NACK frame whatever the error
type it receives in digital_in_recv_dep_res(). It actually should only
send a NACK frame on CRC or parity check errors or on any transmission
error if a NACK frame was previously sent. Existing drivers used to send
EIO error for this kind of issues so this patch limits sending of NACK
frames on EIO errors. All other errors will be reported to the upper
layers.

Signed-off-by: default avatarThierry Escande <thierry.escande@collabora.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent b7769344

net/nfc/digital_dep.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -664,7 +664,7 @@ static void digital_in_recv_dep_res(struct nfc_digital_dev *ddev, void *arg, 
		rc = PTR_ERR(resp);

		rc = PTR_ERR(resp);

		resp = NULL;

		resp = NULL;





		if (((rc != -ETIMEDOUT) || ddev->nack_count) &&

		if ((rc == -EIO || (rc == -ETIMEDOUT && ddev->nack_count)) &&

		    (ddev->nack_count++ < DIGITAL_NFC_DEP_N_RETRY_NACK)) {

		    (ddev->nack_count++ < DIGITAL_NFC_DEP_N_RETRY_NACK)) {

			ddev->atn_count = 0;

			ddev->atn_count = 0;