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 84E3DC433EF for ; Wed, 6 Jul 2022 15:39:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233927AbiGFPju (ORCPT ); Wed, 6 Jul 2022 11:39:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234728AbiGFPht (ORCPT ); Wed, 6 Jul 2022 11:37:49 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1518529833; Wed, 6 Jul 2022 08:34:21 -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 B2FA5B81D99; Wed, 6 Jul 2022 15:34:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7B4C9C3411C; Wed, 6 Jul 2022 15:34:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1657121658; bh=Z2HQGLIkBvZtpzj7Pa3bonQkifFz6NyE9g0PSFGompU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qlxhbJHw/mcpagYj2YJ0bPiOplfMPMWC5sROjJZrH9bD0e+OuSla6HC3x35t9zz4t aZTbCJAYy/SxliaocDkvAZ/fEmLJXV8+RAhUnmy0G9edyjgMPz0xMUJ9wMfTeifXIt 8UPotw/5Em1FNn1lXwcyXejK0hQtqIEn40mvXd8VXxHkW4oQVdXpmuAIe32ibgM/az Az0xZ3myu8IPpsVX8dQvpUGbD1CCdOD3h6yOJBOJFsOQJjKSZ1rplZIJZkKZm11kOd 2uDTlEfFoeOF4Uftvjq8KUOGw1oWig6/tcqe7+Lbr3YiDo0+GDWSavNOUYHHZCCx+U NfENv2rDf7bjQ== 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 4.9 5/5] NFC: nxp-nci: don't print header length mismatch on i2c error Date: Wed, 6 Jul 2022 11:34:07 -0400 Message-Id: <20220706153407.1598915-5-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220706153407.1598915-1-sashal@kernel.org> References: <20220706153407.1598915-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 7eab97585f22..1fc8a3621814 100644 --- a/drivers/nfc/nxp-nci/i2c.c +++ b/drivers/nfc/nxp-nci/i2c.c @@ -139,7 +139,9 @@ static int nxp_nci_i2c_fw_read(struct nxp_nci_i2c_phy *phy, memcpy(skb_put(*skb, NXP_NCI_FW_HDR_LEN), &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); @@ -181,7 +183,9 @@ static int nxp_nci_i2c_nci_read(struct nxp_nci_i2c_phy *phy, 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