xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[ 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: Michael Walle <michael@walle.cc>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Michael Walle
2022-06-27 19:06:43 +02:00
committed by Greg Kroah-Hartman
parent efa78f2ae3
commit de876f36f9
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/nfc/nxp-nci/i2c.c
View File

@@ -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); skb_put_data(*skb, &header, NXP_NCI_FW_HDR_LEN);
r = i2c_master_recv(client, skb_put(*skb, frame_len), frame_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, nfc_err(&client->dev,
"Invalid frame length: %u (expected %zu)\n", "Invalid frame length: %u (expected %zu)\n",
r, frame_len); r, frame_len);
@@ -166,7 +168,9 @@ static int nxp_nci_i2c_nci_read(struct nxp_nci_i2c_phy *phy,
return 0; return 0;
r = i2c_master_recv(client, skb_put(*skb, header.plen), header.plen); 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, nfc_err(&client->dev,
"Invalid frame payload length: %u (expected %u)\n", "Invalid frame payload length: %u (expected %u)\n",
r, header.plen); r, header.plen);