Skip to content

Commit 9577fc5

Browse files
mwalledavem330
authored andcommitted
NFC: nxp-nci: don't print header length mismatch on i2c error
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>
1 parent eddd95b commit 9577fc5

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

drivers/nfc/nxp-nci/i2c.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,9 @@ static int nxp_nci_i2c_fw_read(struct nxp_nci_i2c_phy *phy,
122122
skb_put_data(*skb, &header, NXP_NCI_FW_HDR_LEN);
123123

124124
r = i2c_master_recv(client, skb_put(*skb, frame_len), frame_len);
125-
if (r != frame_len) {
125+
if (r < 0) {
126+
goto fw_read_exit_free_skb;
127+
} else if (r != frame_len) {
126128
nfc_err(&client->dev,
127129
"Invalid frame length: %u (expected %zu)\n",
128130
r, frame_len);
@@ -166,7 +168,9 @@ static int nxp_nci_i2c_nci_read(struct nxp_nci_i2c_phy *phy,
166168
return 0;
167169

168170
r = i2c_master_recv(client, skb_put(*skb, header.plen), header.plen);
169-
if (r != header.plen) {
171+
if (r < 0) {
172+
goto nci_read_exit_free_skb;
173+
} else if (r != header.plen) {
170174
nfc_err(&client->dev,
171175
"Invalid frame payload length: %u (expected %u)\n",
172176
r, header.plen);

0 commit comments

Comments
 (0)