lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: natsemi: Fix missing pci_disable_device() in probe and remove

Browse Source 
[ Upstream commit 7fe74dfd41c428afb24e2e615470832fa997ff14 ]

Replace pci_enable_device() with pcim_enable_device(),
pci_disable_device() and pci_release_regions() will be
called in release automatically.

Fixes: 1da177e4c3 ("Linux-2.6.12-rc2")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wang Hai <wanghai38@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Wang Hai 2021-07-31 14:38:01 +08:00 committed by Greg Kroah-Hartman
parent 6934040698
commit 9d440b5c1d
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/natsemi/natsemi.c
View File

@ -819,7 +819,7 @@ static int natsemi_probe1(struct pci_dev *pdev, const struct pci_device_id *ent)
printk(version); printk(version);
#endif #endif
i = pci_enable_device(pdev); i = pcim_enable_device(pdev);
if (i) return i; if (i) return i;
/* natsemi has a non-standard PM control register /* natsemi has a non-standard PM control register
@ -852,7 +852,7 @@ static int natsemi_probe1(struct pci_dev *pdev, const struct pci_device_id *ent)
ioaddr = ioremap(iostart, iosize); ioaddr = ioremap(iostart, iosize);
if (!ioaddr) { if (!ioaddr) {
i = -ENOMEM; i = -ENOMEM;
goto err_ioremap; goto err_pci_request_regions;
} }
/* Work around the dropped serial bit. */ /* Work around the dropped serial bit. */
@ -974,9 +974,6 @@ static int natsemi_probe1(struct pci_dev *pdev, const struct pci_device_id *ent)
err_register_netdev: err_register_netdev:
iounmap(ioaddr); iounmap(ioaddr);
err_ioremap:
pci_release_regions(pdev);
err_pci_request_regions: err_pci_request_regions:
free_netdev(dev); free_netdev(dev);
return i; return i;
@ -3242,7 +3239,6 @@ static void natsemi_remove1(struct pci_dev *pdev)
NATSEMI_REMOVE_FILE(pdev, dspcfg_workaround); NATSEMI_REMOVE_FILE(pdev, dspcfg_workaround);
unregister_netdev (dev); unregister_netdev (dev);
pci_release_regions (pdev);
iounmap(ioaddr); iounmap(ioaddr);
free_netdev (dev); free_netdev (dev);
} }