From: Michael Walle <michael@walle.cc>
To: Charles Gorand <charles.gorand@effinnov.com>,
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Cc: "Clément Perrochaud" <clement.perrochaud@nxp.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
"Michael Walle" <michael@walle.cc>
Subject: [PATCH 1/2] NFC: nxp-nci: check return code of i2c_master_recv()
Date: Sun, 26 Jun 2022 21:42:42 +0200 [thread overview]
Message-ID: <20220626194243.4059870-1-michael@walle.cc> (raw)
Check the return code of i2c_master_recv() for actual errors and
propagate it to the caller.
Fixes: 6be88670fc59 ("NFC: nxp-nci_i2c: Add I2C support to NXP NCI driver")
Signed-off-by: Michael Walle <michael@walle.cc>
---
drivers/nfc/nxp-nci/i2c.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c
index 7e451c10985d..9c80d5a6d56b 100644
--- a/drivers/nfc/nxp-nci/i2c.c
+++ b/drivers/nfc/nxp-nci/i2c.c
@@ -163,7 +163,10 @@ static int nxp_nci_i2c_nci_read(struct nxp_nci_i2c_phy *phy,
skb_put_data(*skb, (void *)&header, NCI_CTRL_HDR_SIZE);
r = i2c_master_recv(client, skb_put(*skb, header.plen), header.plen);
- if (r != header.plen) {
+ if (r < 0) {
+ nfc_err(&client->dev, "I2C receive error %pe\n", ERR_PTR(r));
+ 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);
--
2.30.2
next reply other threads:[~2022-06-26 19:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-26 19:42 Michael Walle [this message]
2022-06-26 19:42 ` [PATCH 2/2] NFC: nxp-nci: Don't issue a zero length i2c_master_read() Michael Walle
2022-06-26 19:51 ` Krzysztof Kozlowski
2022-06-26 19:56 ` Michael Walle
2022-06-26 20:02 ` Krzysztof Kozlowski
2022-06-28 5:03 ` Jakub Kicinski
2022-06-28 6:42 ` Michael Walle
2022-06-26 19:49 ` [PATCH 1/2] NFC: nxp-nci: check return code of i2c_master_recv() Krzysztof Kozlowski
2022-06-26 19:55 ` Michael Walle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220626194243.4059870-1-michael@walle.cc \
--to=michael@walle.cc \
--cc=charles.gorand@effinnov.com \
--cc=clement.perrochaud@nxp.com \
--cc=krzysztof.kozlowski@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox