diff options
| author | Yang Yingliang <yangyingliang@huawei.com> | 2022-05-10 11:13:16 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-25 09:18:00 +0200 |
| commit | 0ae23a1d472ac5c977cdab2f18a82da2ee0e3f4a (patch) | |
| tree | 99d57d9b65afd37d01c41324ccfee7bc63d1e311 | |
| parent | d4c6e5cebcf5b5d4f90d61074fdbb1cdcb7cdc60 (diff) | |
| download | linux-0ae23a1d472ac5c977cdab2f18a82da2ee0e3f4a.tar.gz linux-0ae23a1d472ac5c977cdab2f18a82da2ee0e3f4a.tar.bz2 linux-0ae23a1d472ac5c977cdab2f18a82da2ee0e3f4a.zip | |
net: stmmac: fix missing pci_disable_device() on error in stmmac_pci_probe()
[ Upstream commit 0807ce0b010418a191e0e4009803b2d74c3245d5 ]
Switch to using pcim_enable_device() to avoid missing pci_disable_device().
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20220510031316.1780409-1-yangyingliang@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 4 |
1 files changed, 1 insertions, 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) |