Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5307704 authored by Yang Yingliang's avatar Yang Yingliang Committed by Greg Kroah-Hartman
Browse files

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: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20220510031316.1780409-1-yangyingliang@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 91d8d7ed

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

+1 −3
Original line number Diff line number Diff line
@@ -481,7 +481,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__);
@@ -538,8 +538,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)