Skip to content

Commit 0807ce0

Browse files
Yang Yingliangkuba-moo
authored andcommitted
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>
1 parent 12a4d67 commit 0807ce0

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ static int stmmac_pci_probe(struct pci_dev *pdev,
181181
return -ENOMEM;
182182

183183
/* Enable pci device */
184-
ret = pci_enable_device(pdev);
184+
ret = pcim_enable_device(pdev);
185185
if (ret) {
186186
dev_err(&pdev->dev, "%s: ERROR: failed to enable device\n",
187187
__func__);
@@ -241,8 +241,6 @@ static void stmmac_pci_remove(struct pci_dev *pdev)
241241
pcim_iounmap_regions(pdev, BIT(i));
242242
break;
243243
}
244-
245-
pci_disable_device(pdev);
246244
}
247245

248246
static int __maybe_unused stmmac_pci_suspend(struct device *dev)

0 commit comments

Comments
 (0)