diff options
| author | Yang Yingliang <yangyingliang@huawei.com> | 2022-05-10 11:13:16 +0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-05-10 19:12:57 -0700 |
| commit | 0807ce0b010418a191e0e4009803b2d74c3245d5 (patch) | |
| tree | c5d1e04f1e506525aa6d1554582cda40094fc146 /drivers/net/ethernet/stmicro | |
| parent | 12a4d677b1c34717443470c1492fe520638ef39a (diff) | |
| download | lwn-0807ce0b010418a191e0e4009803b2d74c3245d5.tar.gz lwn-0807ce0b010418a191e0e4009803b2d74c3245d5.zip | |
net: stmmac: fix missing pci_disable_device() on error in stmmac_pci_probe()
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>
Diffstat (limited to 'drivers/net/ethernet/stmicro')
| -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 fcf17d8a0494..644bb54f5f02 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c @@ -181,7 +181,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 __maybe_unused stmmac_pci_suspend(struct device *dev) |