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

Commit 9d440b5c authored by Wang Hai's avatar Wang Hai Committed by Greg Kroah-Hartman
Browse files

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



[ 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: 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 69340406

drivers/net/ethernet/natsemi/natsemi.c

+2 −6
Original line number Diff line number Diff line
@@ -819,7 +819,7 @@ static int natsemi_probe1(struct pci_dev *pdev, const struct pci_device_id *ent) 
		printk(version);

#endif



	i = pci_enable_device(pdev);

	i = pcim_enable_device(pdev);

	if (i) return i;



	/* 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);

	if (!ioaddr) {

		i = -ENOMEM;

		goto err_ioremap;

		goto err_pci_request_regions;

	}



	/* 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:

	iounmap(ioaddr);



 err_ioremap:

	pci_release_regions(pdev);



 err_pci_request_regions:

	free_netdev(dev);

	return i;
@@ -3242,7 +3239,6 @@ static void natsemi_remove1(struct pci_dev *pdev) 


	NATSEMI_REMOVE_FILE(pdev, dspcfg_workaround);

	unregister_netdev (dev);

	pci_release_regions (pdev);

	iounmap(ioaddr);

	free_netdev (dev);

}