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 820D5C433F5 for ; Wed, 18 May 2022 12:38:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237110AbiERMiN (ORCPT ); Wed, 18 May 2022 08:38:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237247AbiERMev (ORCPT ); Wed, 18 May 2022 08:34:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17CC619CEDD; Wed, 18 May 2022 05:30:28 -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 dfw.source.kernel.org (Postfix) with ESMTPS id D1D256147D; Wed, 18 May 2022 12:30:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2711C36AE3; Wed, 18 May 2022 12:30:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652877027; bh=9r1To4cmU5c4mec6rBMYQpdcINHgYGrxktesEOKlJhI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LzIieOT+J4Ht/1eDupq4xr/XthHcsxwioqxECC/pofiFQ6H3j4Rwx3fRExgiXNTpJ CDJbWcSY1hYC3sGZMN45LkltbEe3iGEvSdG8xNOUSMo/MrOAEFbG+Oq20a6Vis0IHQ kidhHV03fq4/OtIsY093x5Lgt/eLVDf5PiymUg8hWfIRb1MBqoWHkLvPB5dmImqUWf 3Ev6K4Zni7a7gM7/EYBfX9fGZXQVp0ZcwzFwC5eF2Ba5uev3Eip0n5A9LOxsobv0g+ xhYIF4BdVs88BN5yGXuhIeUz2dUBu8uiNVbCxyvMgaqhpMCVH0EW2OPiPLW7q2uUYf aeWUdbrlv+yWQ== 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.9 4/4] net: stmmac: fix missing pci_disable_device() on error in stmmac_pci_probe() Date: Wed, 18 May 2022 08:30:16 -0400 Message-Id: <20220518123016.343867-4-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220518123016.343867-1-sashal@kernel.org> References: <20220518123016.343867-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: 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 49eaede34eea..9beb93479e28 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c @@ -183,7 +183,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__); @@ -241,8 +241,6 @@ static void stmmac_pci_remove(struct pci_dev *pdev) pcim_iounmap_regions(pdev, BIT(i)); break; } - - pci_disable_device(pdev); } static int stmmac_pci_suspend(struct device *dev) -- 2.35.1