| Message ID | 20220627170643.98239-2-michael@walle.cc (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9577fc5fdc8b07b891709af6453545db405e24ad |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2,1/2] NFC: nxp-nci: Don't issue a zero length i2c_master_read() | expand |
On 27/06/2022 19:06, Michael Walle wrote: > 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> > --- > changes since v1: > - reworded commit message > - removed fixes tag > - removed nfc_err() call, as it is done elsewhere in this driver > - nxp_nci_i2c_fw_read() has the same issue. also handle it there > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c index e8f3b35afbee..ae2ba08d8ac3 100644 --- a/drivers/nfc/nxp-nci/i2c.c +++ b/drivers/nfc/nxp-nci/i2c.c @@ -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);
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> --- changes since v1: - reworded commit message - removed fixes tag - removed nfc_err() call, as it is done elsewhere in this driver - nxp_nci_i2c_fw_read() has the same issue. also handle it there drivers/nfc/nxp-nci/i2c.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)