summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYang Yingliang <yangyingliang@huawei.com>2022-10-24 21:13:38 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-11-03 23:52:32 +0900
commit034d7f171918a816cf105a59285a77adbb2c9608 (patch)
treea842ee3a6831d014e58458e7842850808147782e
parentc62669585e6cfc25fbbccd34d206c550606b8379 (diff)
downloadlinux-stable-034d7f171918a816cf105a59285a77adbb2c9608.tar.gz
linux-stable-034d7f171918a816cf105a59285a77adbb2c9608.tar.bz2
linux-stable-034d7f171918a816cf105a59285a77adbb2c9608.zip
net: ksz884x: fix missing pci_disable_device() on error in pcidev_init()
[ Upstream commit 5da6d65590a0698199df44d095e54b0ed1708178 ] pci_disable_device() need be called while module exiting, switch to use pcim_enable(), pci_disable_device() will be called in pcim_release() while unbinding device. Fixes: 8ca86fd83eae ("net: Micrel KSZ8841/2 PCI Ethernet driver") Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Link: https://lore.kernel.org/r/20221024131338.2848959-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/micrel/ksz884x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index 623a05d78343..beec87ec15f5 100644
--- a/drivers/net/ethernet/micrel/ksz884x.c
+++ b/drivers/net/ethernet/micrel/ksz884x.c
@@ -6936,7 +6936,7 @@ static int pcidev_init(struct pci_dev *pdev, const struct pci_device_id *id)
char banner[sizeof(version)];
struct ksz_switch *sw = NULL;
- result = pci_enable_device(pdev);
+ result = pcim_enable_device(pdev);
if (result)
return result;