From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 20A4CC43334 for ; Wed, 6 Jul 2022 15:36:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234462AbiGFPgo (ORCPT ); Wed, 6 Jul 2022 11:36:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234289AbiGFPfv (ORCPT ); Wed, 6 Jul 2022 11:35:51 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 080A428E3E; Wed, 6 Jul 2022 08:33:34 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 95B67B81DA1; Wed, 6 Jul 2022 15:33:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E3B9C341CF; Wed, 6 Jul 2022 15:33:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1657121611; bh=xGghK/000nkzlwE1Ow+hHRRrqU5Gk5XuDqiFw+ahnJU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hznQIxY2qUGm/2ETYiwhPq2H8mpLIHp0Py0jvJtgrTIdL6CBcvgC9rXdpLuOFeGr3 NXBbrExUqruriCIcWsMvJ+FSJcvn1ZXdjbtc6o/nfSEYh4Ls2RCTyDFbRoMezNcJz1 dF/xxYEYrkiyAB+5u3/ED+eac3w0+But0SxBl0Zmo5mYHDg9AbDBvIvYjMnI7LDO6c zR1r4EE1zAOxPOcgTRZ6dKmhBUsBu2hVL5B984kkF1Jnq/5ky0RDvHup+1ZxfnkzQ9 Kpq+kreDx/TxAJ+ba2Pl3VjZWfffNZQMfCISbELmL25KdQk8rQN977Bxa9f5vKfHqf 1/+KpUFa7OfEA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Michael Walle , Krzysztof Kozlowski , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 7/9] NFC: nxp-nci: don't print header length mismatch on i2c error Date: Wed, 6 Jul 2022 11:33:13 -0400 Message-Id: <20220706153316.1598554-7-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220706153316.1598554-1-sashal@kernel.org> References: <20220706153316.1598554-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Michael Walle [ 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 Reviewed-by: Krzysztof Kozlowski Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/nfc/nxp-nci/i2c.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c index 9f60e4dc5a90..a45064b3389c 100644 --- 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 nxp_nci_i2c_phy *phy, 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); @@ -163,7 +165,9 @@ 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) { + 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.35.1