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 DED55C433EF for ; Wed, 18 May 2022 12:31:00 +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=dqb8UNNkK5vVVpMtaHzbYK+RHuEv3o+qrHDkY8udhKo=; b=0mo0dM+PvwNXCQ Yw1mkwAf60UbUe5kN+VGHji2dCqfXEdyh7tckz3V1X6Q4nvwNEiCn/bqMFx2Eis3PFS0SfkeVzWxc MjALaYty3ySYZ+CbMt9A+W60//d7ME5WQ+XwxSLxHeBNVmRsgbxjWKOSrM04YGiTXJ81JlXfVXNgC gaeXPYfyYNrGbMxhK/szvp4rVgOlXry85trcyPlI3WhW0i/VqOyI4CqSUE0MXg+QXYu6f1ktBPDur 1ThcWxYcJZlWiW8mZJA39R6hYPmGRYzwk5ePV1S07/tLTsB4pea7VCSWwxATtYOZN+pV9Iw61d1iq v1tZvi8pJktW95pQOuXQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nrIoD-0021kk-90; Wed, 18 May 2022 12:29:45 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nrInc-0021R2-9s for linux-arm-kernel@lists.infradead.org; Wed, 18 May 2022 12:29:09 +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 D2B9161688; Wed, 18 May 2022 12:29:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 86894C34115; Wed, 18 May 2022 12:29:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652876947; bh=42PM6dOkOHCRC2FBrGXfnR8GSDJ2PkeUDH8j3L6sqfM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aV3bczN4nXl2X4zPOQugrlh7QYHHldE/PGSGXSNP3kl6sWpFOWyUgEdQh8M9P/2Kn +sZ2zNPg9AN2ZgpbT3NPIOzwSFcCIwP+KXmTJi18MpShjV+L6jzMZDa/kIPczHyS+K 3Aj5Pqrl19cwe5Rg5GNbXGTqxIpxHSSneekxyLXm6fI8aiFzNmHqMhG4bj/nMpaxKz woB3y/vwKLXyAFUGY0+UVA6I/stvbFXVTQLPe/uoD9fAFu/G7ydM1vb6E7PpVGBHq7 yA5FHYaA9yXwcOG2KL/clOCvzX+4uIUj6sF7f1/I+ivhWO1NtCptA3uQlFWpROXHAD y1bVzFSx/UtaA== 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 5.10 07/13] net: stmmac: fix missing pci_disable_device() on error in stmmac_pci_probe() Date: Wed, 18 May 2022 08:28:38 -0400 Message-Id: <20220518122844.343220-7-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220518122844.343220-1-sashal@kernel.org> References: <20220518122844.343220-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_052908_442076_498DF877 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 272cb47af9f2..a7a1227c9b92 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c @@ -175,7 +175,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__); @@ -227,8 +227,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