| From eb50241dbdac83c2d0486ecd39522914a9f06a1e Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 10 May 2022 11:13:16 +0800 |
| Subject: net: stmmac: fix missing pci_disable_device() on error in |
| stmmac_pci_probe() |
| |
| From: Yang Yingliang <yangyingliang@huawei.com> |
| |
| [ 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> |
| --- |
| 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 |
| |
