Skip to content

Commit eddd95b

Browse files
mwalledavem330
authored andcommitted
NFC: nxp-nci: Don't issue a zero length i2c_master_read()
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: 6be8867 ("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>
1 parent 00aff35 commit eddd95b

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

drivers/nfc/nxp-nci/i2c.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,9 @@ static int nxp_nci_i2c_nci_read(struct nxp_nci_i2c_phy *phy,
162162

163163
skb_put_data(*skb, (void *)&header, NCI_CTRL_HDR_SIZE);
164164

165+
if (!header.plen)
166+
return 0;
167+
165168
r = i2c_master_recv(client, skb_put(*skb, header.plen), header.plen);
166169
if (r != header.plen) {
167170
nfc_err(&client->dev,

0 commit comments

Comments
 (0)