Message ID | 20221024131338.2848959-1-yangyingliang@huawei.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 5da6d65590a0698199df44d095e54b0ed1708178 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net] net: ksz884x: fix missing pci_disable_device() on error in pcidev_init() | expand |
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Mon, 24 Oct 2022 21:13:38 +0800 you wrote: > 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> > > [...] Here is the summary with links: - [net] net: ksz884x: fix missing pci_disable_device() on error in pcidev_init() https://git.kernel.org/netdev/net/c/5da6d65590a0 You are awesome, thank you!
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c index 468520079c65..e6acd1e7b263 100644 --- a/drivers/net/ethernet/micrel/ksz884x.c +++ b/drivers/net/ethernet/micrel/ksz884x.c @@ -6851,7 +6851,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;
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> --- drivers/net/ethernet/micrel/ksz884x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)