lkml.org 
[lkml]   [2022]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 084/112] NFC: nxp-nci: dont print header length mismatch on i2c error
    Date
    From: Michael Walle <michael@walle.cc>

    [ Upstream commit 9577fc5fdc8b07b891709af6453545db405e24ad ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/nfc/nxp-nci/i2c.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    --- 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 nx
    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 n
    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);

    \
     
     \ /
      Last update: 2022-07-19 14:27    [W:5.171 / U:0.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site