diff options
| author | Michael Walle <michael@walle.cc> | 2022-06-27 19:06:42 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-07-07 17:35:11 +0200 |
| commit | 7f349ad933d00b259852497078b694fc42f4db2b (patch) | |
| tree | 3345b75e2cb00aada8dfafcce2adf8f1c5688c68 | |
| parent | 151646cdf68ced84d3730bbcab49e2ac7a5d31b5 (diff) | |
| download | linux-7f349ad933d00b259852497078b694fc42f4db2b.tar.gz linux-7f349ad933d00b259852497078b694fc42f4db2b.tar.bz2 linux-7f349ad933d00b259852497078b694fc42f4db2b.zip | |
NFC: nxp-nci: Don't issue a zero length i2c_master_read()
commit eddd95b9423946aaacb55cac6a9b2cea8ab944fc upstream.
There are packets which doesn't have a payload. In that case, the second
i2c_master_read() will have a zero length. But because the NFC
controller doesn't have any data left, it will NACK the I2C read and
-ENXIO will be returned. In case there is no payload, just skip the
second i2c master read.
Fixes: 6be88670fc59 ("NFC: nxp-nci_i2c: Add I2C support to NXP NCI driver")
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/nfc/nxp-nci/i2c.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c index 0df745cad601..16c52d4c833c 100644 --- a/drivers/nfc/nxp-nci/i2c.c +++ b/drivers/nfc/nxp-nci/i2c.c @@ -178,6 +178,9 @@ static int nxp_nci_i2c_nci_read(struct nxp_nci_i2c_phy *phy, skb_put_data(*skb, (void *)&header, NCI_CTRL_HDR_SIZE); + if (!header.plen) + return 0; + r = i2c_master_recv(client, skb_put(*skb, header.plen), header.plen); if (r != header.plen) { nfc_err(&client->dev, |