patch-2.3.47 linux/drivers/net/yellowfin.c

• Lines: 31
• Date: Sun Feb 20 09:06:14 2000
• Orig file: v2.3.46/linux/drivers/net/yellowfin.c
• Orig date: Wed Feb 16 17:03:52 2000

diff -u --recursive --new-file v2.3.46/linux/drivers/net/yellowfin.c linux/drivers/net/yellowfin.c
@@ -75,7 +75,6 @@
 #error You must compile this driver with "-O".
 #endif
 
-#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/modversions.h>
@@ -851,7 +850,7 @@
 	/* Code that should never be run!  Perhaps remove after testing.. */
 	{
 		static int stopit = 10;
-		if ((!(test_bit(LINK_STATE_START, &dev->state)))  &&  --stopit < 0) {
+		if ((!(netif_running(dev)))  &&  --stopit < 0) {
 			printk(KERN_ERR "%s: Emergency stop, looping startup interrupt.\n",
 				   dev->name);
 			free_irq(irq, dev);
@@ -1378,7 +1377,12 @@
 {
 	if (debug)					/* Emit version even if no cards detected. */
 		printk(KERN_INFO "%s", version);
-	return pci_register_driver (&yellowfin_driver) > 0 ? 0 : -ENODEV;
+
+	if (pci_register_driver (&yellowfin_driver) > 0)
+		return 0;
+
+	pci_unregister_driver (&yellowfin_driver);
+	return -ENODEV;
 }