tulip: windbond-840: Fix missing pci_disable_device() in probe and remove
Subsystems (3)
PATCH 1/1 tulip: windbond-840: Fix missing pci_disable_device() in probe and remove
Replace pci_enable_device() with pcim_enable_device(), pci_disable_device() and pci_release_regions() will be called in release automatically.
Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")
Reported-by Hulk Robot <[email protected]>
Signed-off-by Wang Hai <[email protected]>
--- drivers/net/ethernet/dec/tulip/winbond-840.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/net/ethernet/dec/tulip/winbond-840.c +2 -5
@@ -357,7 +357,7 @@ static int w840_probe1(struct pci_dev *pdev, const struct pci_device_id *ent)int i, option = find_cnt <MAX_UNITS ? options[find_cnt] :0 ;void __iomem *ioaddr; - i =pci_enable_device (pdev); + i =pcim_enable_device (pdev);if (i)return i;pci_set_master (pdev);
@@ -379,7 +379,7 @@ static int w840_probe1(struct pci_dev *pdev, const struct pci_device_id *ent) ioaddr =pci_iomap (pdev,TULIP_BAR , netdev_res_size);if (!ioaddr) - goto err_out_free_res; + goto err_out_netdev;for (i =0 ; i <3 ; i++) ((__le16 *)dev->dev_addr)[i] =cpu_to_le16 (eeprom_read (ioaddr, i));
@@ -458,8 +458,6 @@ static int w840_probe1(struct pci_dev *pdev, const struct pci_device_id *ent) err_out_cleardev:pci_iounmap (pdev, ioaddr); -err_out_free_res: -pci_release_regions (pdev); err_out_netdev:free_netdev (dev);return -ENODEV ;
@@ -1526,7 +1524,6 @@ static void w840_remove1(struct pci_dev *pdev)if (dev) {struct netdev_private *np =netdev_priv (dev);unregister_netdev (dev); -pci_release_regions (pdev);pci_iounmap (pdev, np->base_addr);free_netdev (dev); }
Signature · 1 line
2.17.1
This patch was applied to netdev/net.git (refs/heads/master):
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
Quoted 9 lines · On Wed, 28 Jul 2021 15:43:13 +0800 you wrote:
Replace
pci_enable_device()withpcim_enable_device(),pci_disable_device()andpci_release_regions()will be called in release automatically.Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")Reported-by Hulk Robot <[email protected]>Signed-off-by Wang Hai <[email protected]>[...]
Here is the summary with links:
- tulip: windbond-840: Fix missing pci_disable_device() in probe and remove
https://git.kernel.org/netdev/net/c/76a16be07b20
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html