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 X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C33BC433F5 for ; Sat, 11 Sep 2021 13:16:11 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4D6A561153 for ; Sat, 11 Sep 2021 13:16:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4D6A561153 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=l0X3mDoPzgGa74aUmSO72kk4nPIg4WmnkN9Mwrg7xXM=; b=QMnF70lSAttKoT xcBJvnE0L9M090bs+14+DlD31MSHp3SKYcp5wnX7OeXLNyV/m9yIMu3o8czucRBKFSMyp8dcP8AEq PMnjyjxfBMGpdSf+ssNCCOhbsWiXnMxJlzHXPCdCbr9FkkbCW5FBl2LxT0x/KsL1L/l3QP5iBjlZB 8S8FdgMINjc53AbJuKF0UL5436KkKCHkIytjOb52qlP0KRG4xV4IMRulmJn8qh1yVu+TK3NhNPj0+ HGDoUJ7NRFyfglhHCd/qwTq0MyNXOR7LYFGN/W3NHFd9GS7EdaN7sHR7/xjZIt46g/73cRrViAsnb Is52F+5+JXYdeEX9tsbQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mP2pq-00ErrW-Dg; Sat, 11 Sep 2021 13:14:23 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mP2o3-00Eqth-3c for linux-arm-kernel@lists.infradead.org; Sat, 11 Sep 2021 13:12:33 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 08210611BF; Sat, 11 Sep 2021 13:12:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631365950; bh=EFMNFVAc5CcSijdhhhVHCaxpm6yJnxx8kYaKNOizbCs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kBMp8Gx8eUongj6OpSwfLMKLKZ/Vlf/9JE+rtHXUhqURe7gBUY8smYocC3K9pSKca 4IdmfBinbUdwfNfr+IK6q3j1SowQlJZfQco2gjA8J8W9NrbcVqLlRqfM0IRvRyXQnC r81xMxtQ6TSslmDv+VbLhEnTqypbSD5E2o/ZO6wn8715crkbChGKu2DEkgWbZzh+Um xo/AwESeWa9kZVO8qIr7o1j5uGrgI75Hu8eb2b3Gt5BB4Zar46L7dMiyw8MFSQ2dOz rb3h6SuJD0Nw6keYLdpURDQZa2uS/ZClQGHbfFk44GF6clPlGhQ04FE5kG9Ul3p4xS 9LM8DqE5vETuA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: zhaoxiao , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.14 31/32] stmmac: dwmac-loongson:Fix missing return value Date: Sat, 11 Sep 2021 09:11:48 -0400 Message-Id: <20210911131149.284397-31-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210911131149.284397-1-sashal@kernel.org> References: <20210911131149.284397-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210911_061231_214775_8D1D2BAE X-CRM114-Status: GOOD ( 10.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: zhaoxiao [ Upstream commit 5289de5929d1758a95477a4d160195397ccffa7b ] Add the return value when phy_mode < 0. Signed-off-by: zhaoxiao Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c index 4c9a37dd0d3f..ecf759ee1c9f 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c @@ -109,8 +109,10 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id plat->bus_id = pci_dev_id(pdev); phy_mode = device_get_phy_mode(&pdev->dev); - if (phy_mode < 0) + if (phy_mode < 0) { dev_err(&pdev->dev, "phy_mode not found\n"); + return phy_mode; + } plat->phy_interface = phy_mode; plat->interface = PHY_INTERFACE_MODE_GMII; -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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 X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE2F4C433F5 for ; Sat, 11 Sep 2021 13:13:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9428E6135F for ; Sat, 11 Sep 2021 13:13:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236364AbhIKNPB (ORCPT ); Sat, 11 Sep 2021 09:15:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:38164 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236348AbhIKNNn (ORCPT ); Sat, 11 Sep 2021 09:13:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 08210611BF; Sat, 11 Sep 2021 13:12:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631365950; bh=EFMNFVAc5CcSijdhhhVHCaxpm6yJnxx8kYaKNOizbCs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kBMp8Gx8eUongj6OpSwfLMKLKZ/Vlf/9JE+rtHXUhqURe7gBUY8smYocC3K9pSKca 4IdmfBinbUdwfNfr+IK6q3j1SowQlJZfQco2gjA8J8W9NrbcVqLlRqfM0IRvRyXQnC r81xMxtQ6TSslmDv+VbLhEnTqypbSD5E2o/ZO6wn8715crkbChGKu2DEkgWbZzh+Um xo/AwESeWa9kZVO8qIr7o1j5uGrgI75Hu8eb2b3Gt5BB4Zar46L7dMiyw8MFSQ2dOz rb3h6SuJD0Nw6keYLdpURDQZa2uS/ZClQGHbfFk44GF6clPlGhQ04FE5kG9Ul3p4xS 9LM8DqE5vETuA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: zhaoxiao , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.14 31/32] stmmac: dwmac-loongson:Fix missing return value Date: Sat, 11 Sep 2021 09:11:48 -0400 Message-Id: <20210911131149.284397-31-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210911131149.284397-1-sashal@kernel.org> References: <20210911131149.284397-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: zhaoxiao [ Upstream commit 5289de5929d1758a95477a4d160195397ccffa7b ] Add the return value when phy_mode < 0. Signed-off-by: zhaoxiao Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c index 4c9a37dd0d3f..ecf759ee1c9f 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c @@ -109,8 +109,10 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id plat->bus_id = pci_dev_id(pdev); phy_mode = device_get_phy_mode(&pdev->dev); - if (phy_mode < 0) + if (phy_mode < 0) { dev_err(&pdev->dev, "phy_mode not found\n"); + return phy_mode; + } plat->phy_interface = phy_mode; plat->interface = PHY_INTERFACE_MODE_GMII; -- 2.30.2