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

Commit 08082a64 authored by Michael Walle's avatar Michael Walle Committed by Greg Kroah-Hartman
Browse files

NFC: nxp-nci: don't print header length mismatch on i2c error 



[ Upstream commit 9577fc5fdc8b07b891709af6453545db405e24ad ]

Don't print a misleading header length mismatch error if the i2c call
returns an error. Instead just return the error code without any error
message.

Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 4919d82f

drivers/nfc/nxp-nci/i2c.c

+6 −2
Original line number Diff line number Diff line
@@ -122,7 +122,9 @@ static int nxp_nci_i2c_fw_read(struct nxp_nci_i2c_phy *phy, 
	skb_put_data(*skb, &header, NXP_NCI_FW_HDR_LEN);



	r = i2c_master_recv(client, skb_put(*skb, frame_len), frame_len);

	if (r != frame_len) {

	if (r < 0) {

		goto fw_read_exit_free_skb;

	} else if (r != frame_len) {

		nfc_err(&client->dev,

			"Invalid frame length: %u (expected %zu)\n",

			r, frame_len);
@@ -166,7 +168,9 @@ static int nxp_nci_i2c_nci_read(struct nxp_nci_i2c_phy *phy, 
		return 0;



	r = i2c_master_recv(client, skb_put(*skb, header.plen), header.plen);

	if (r != header.plen) {

	if (r < 0) {

		goto nci_read_exit_free_skb;

	} else if (r != header.plen) {

		nfc_err(&client->dev,

			"Invalid frame payload length: %u (expected %u)\n",

			r, header.plen);