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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id BE788C433EF for ; Wed, 18 May 2022 12:33:25 +0000 (UTC) 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=d0XjcXrlX1fmbMXJzPDlPh6aak9/qqH8ZceI/MehSsc=; b=tQHnO4YM2OV4HE k64OZToQnOoTjtkZXLf6am0muvQKonO7c4f3WM7aIRutQXdxyBVvpdFAu2++TjM++Tq5CTj12ztA1 4HhW66SXWr3qsFolT41lYKCH3tMExVODj8jkAsBbjFNfTIUv5pOINlUWF/nfQbrd30K9Vp71t3loy F0OSyrj5aMEQvjO3wskrniD5/MP9XyHZT3sMdkdYOL8MC4f5hedGXkIa9IuHMne/5xviCYhuQjgKA Q8AAzn+wGNo5xyhxAOa/Px4Y3pzcAReQYB4cTcldr9bS1XBTVql4HPUyn1o2IC2VY/fu9P7kskDaQ d7LV3NGdRNSiV4XFOs5g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nrIqe-0023Be-TO; Wed, 18 May 2022 12:32:17 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nrIof-00222K-3O for linux-arm-kernel@lists.infradead.org; Wed, 18 May 2022 12:30:15 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id A2EB061688; Wed, 18 May 2022 12:30:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3A56BC385A5; Wed, 18 May 2022 12:30:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652877012; bh=U3MCaPU4KcqqPQx9TyAhzv+aeX5+rNSIakb60lLPjGQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mCFfTjqNZ55el+4Q29UCl86uNw3uXPVFWY+0bMYe0SDMhZQeAt/JrwMnWxNKQME83 aTPtw7gykRdLnetsLGbmfEA9Et4Nc/xuXsgTWA7XhvWTE3wD1IrkIx2azLMb8kYFfr IXvvP8u/jH1JVpOz5LnOxaZrf3Pg6tKpjFY0/OIo4vvKVSlbouhFXCvV+Pt+mNQSch 0yciW5AugL9lAXnPzXpoiw/AaAMttMK0u3ruqZMZgvl5ninejuWT8QMaZwWbzUcX17 gLq6amQc38ET/BmBNhhMexp//CSA4qd3QlFVPhg0SCDncrEMy31BAPAFJl2nIpeudx qrmlPhGkv0cag== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yang Yingliang , Hulk Robot , Jakub Kicinski , Sasha Levin , peppe.cavallaro@st.com, alexandre.torgue@foss.st.com, joabreu@synopsys.com, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, mcoquelin.stm32@gmail.com, netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.14 4/5] net: stmmac: fix missing pci_disable_device() on error in stmmac_pci_probe() Date: Wed, 18 May 2022 08:29:59 -0400 Message-Id: <20220518123000.343787-4-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220518123000.343787-1-sashal@kernel.org> References: <20220518123000.343787-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-20220518_053013_205233_2F873BEB X-CRM114-Status: GOOD ( 11.68 ) 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: Yang Yingliang [ Upstream commit 0807ce0b010418a191e0e4009803b2d74c3245d5 ] Switch to using pcim_enable_device() to avoid missing pci_disable_device(). Reported-by: Hulk Robot Signed-off-by: Yang Yingliang Link: https://lore.kernel.org/r/20220510031316.1780409-1-yangyingliang@huawei.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c index cc1e887e47b5..3dec109251ad 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c @@ -261,7 +261,7 @@ static int stmmac_pci_probe(struct pci_dev *pdev, return -ENOMEM; /* Enable pci device */ - ret = pci_enable_device(pdev); + ret = pcim_enable_device(pdev); if (ret) { dev_err(&pdev->dev, "%s: ERROR: failed to enable device\n", __func__); @@ -313,8 +313,6 @@ static void stmmac_pci_remove(struct pci_dev *pdev) pcim_iounmap_regions(pdev, BIT(i)); break; } - - pci_disable_device(pdev); } static int __maybe_unused stmmac_pci_suspend(struct device *dev) -- 2.35.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel