Hello,
natsemi doesn't call pci_disable_device() during exit or error in init.
So this patch does it.
Michal
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/10/21 10:56:57+02:00 [email protected]
# [NATSEMI] Add missing pci_disable_device().
#
# drivers/net/natsemi.c
# 2004/10/21 10:56:45+02:00 [email protected] +9 -3
# Add missing pci_disable_device().
#
diff -Nru a/drivers/net/natsemi.c b/drivers/net/natsemi.c
--- a/drivers/net/natsemi.c 2004-10-21 10:58:06 +02:00
+++ b/drivers/net/natsemi.c 2004-10-21 10:58:06 +02:00
@@ -821,7 +821,7 @@
#endif
i = pci_enable_device(pdev);
- if (i) return i;
+ if (i) goto out;
/* natsemi has a non-standard PM control register
* in PCI config space. Some boards apparently need
@@ -843,8 +843,10 @@
pci_set_master(pdev);
dev = alloc_etherdev(sizeof (struct netdev_private));
- if (!dev)
- return -ENOMEM;
+ if (!dev) {
+ i = -ENOMEM;
+ goto err_alloc_etherdev;
+ }
SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &pdev->dev);
@@ -1001,6 +1003,9 @@
err_pci_request_regions:
free_netdev(dev);
+ err_alloc_etherdev:
+ pci_disable_device(pdev);
+ out:
return i;
}
@@ -3133,6 +3138,7 @@
iounmap(ioaddr);
free_netdev (dev);
pci_set_drvdata(pdev, NULL);
+ pci_disable_device(pdev);
}
#ifdef CONFIG_PM