patch-2.4.0-test2 linux/drivers/net/es3210.c

• Lines: 44
• Date: Mon Jun 19 13:30:58 2000
• Orig file: v2.4.0-test1/linux/drivers/net/es3210.c
• Orig date: Thu May 11 15:30:07 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/net/es3210.c linux/drivers/net/es3210.c
@@ -181,9 +181,6 @@
 		return ENODEV;
 	}
 
-	if (load_8390_module("es3210.c"))
-		return -ENOSYS;
-
 	/* We should have a "dev" from Space.c or the static module table. */
 	if (dev == NULL) {
 		printk("es3210.c: Passed a NULL device.\n");
@@ -404,6 +401,9 @@
 {
 	int this_dev, found = 0;
 
+	if (load_8390_module("es3210.c"))
+		return -ENOSYS;
+
 	for (this_dev = 0; this_dev < MAX_ES_CARDS; this_dev++) {
 		struct net_device *dev = &dev_es3210[this_dev];
 		dev->irq = irq[this_dev];
@@ -415,14 +415,13 @@
 		if (register_netdev(dev) != 0) {
 			printk(KERN_WARNING "es3210.c: No es3210 card found (i/o = 0x%x).\n", io[this_dev]);
 			if (found != 0) {	/* Got at least one. */
-				lock_8390_module();
 				return 0;
 			}
+			unload_8390_module();
 			return -ENXIO;
 		}
 		found++;
 	}
-	lock_8390_module();
 	return 0;
 }
 
@@ -441,6 +440,6 @@
 			kfree(priv);
 		}
 	}
-	unlock_8390_module();
+	unload_8390_module();
 }
 #endif /* MODULE */