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

Commit 4f362e8b authored by Wang Hai's avatar Wang Hai Committed by Greg Kroah-Hartman
Browse files

tulip: windbond-840: Fix missing pci_disable_device() in probe and remove 



[ Upstream commit 76a16be07b209a3f507c72abe823bd3af1c8661a ]

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

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarWang Hai <wanghai38@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 84dd1190

drivers/net/ethernet/dec/tulip/winbond-840.c

+2 −5
Original line number Diff line number Diff line
@@ -368,7 +368,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);
@@ -390,7 +390,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));
@@ -469,8 +469,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;
@@ -1537,7 +1535,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);

	}