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

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

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/net/hp.c linux/drivers/net/hp.c
@@ -92,7 +92,7 @@
 	if (base_addr > 0x1ff)		/* Check a single specified location. */
 		return hp_probe1(dev, base_addr);
 	else if (base_addr != 0)	/* Don't probe at all. */
-		return ENXIO;
+		return -ENXIO;
 
 	for (i = 0; hppclan_portlist[i]; i++) {
 		int ioaddr = hppclan_portlist[i];
@@ -102,7 +102,7 @@
 			return 0;
 	}
 
-	return ENODEV;
+	return -ENODEV;
 }
 #endif
 
@@ -119,7 +119,7 @@
 		|| inb(ioaddr+1) != 0x00
 		|| inb(ioaddr+2) != 0x09
 		|| inb(ioaddr+14) == 0x57)
-		return ENODEV;
+		return -ENODEV;
 
 	/* Set up the parameters based on the board ID.
 	   If you have additional mappings, please mail them to me -djb. */
@@ -131,9 +131,6 @@
 		wordmode = 0;
 	}
 
-	if (load_8390_module("hp.c"))
-		return -ENOSYS;
-
 	/* We should have a "dev" from Space.c or the static module table. */
 	if (dev == NULL) {
 		printk("hp.c: Passed a NULL device.\n");
@@ -178,7 +175,7 @@
 			printk(" no free IRQ lines.\n");
 			kfree(dev->priv);
 			dev->priv = NULL;
-			return EBUSY;
+			return -EBUSY;
 		}
 	} else {
 		if (dev->irq == 2)
@@ -187,7 +184,7 @@
 			printk (" unable to get IRQ %d.\n", dev->irq);
 			kfree(dev->priv);
 			dev->priv = NULL;
-			return EBUSY;
+			return -EBUSY;
 		}
 	}
 
@@ -407,6 +404,9 @@
 {
 	int this_dev, found = 0;
 
+	if (load_8390_module("hp.c"))
+		return -ENOSYS;
+
 	for (this_dev = 0; this_dev < MAX_HP_CARDS; this_dev++) {
 		struct net_device *dev = &dev_hp[this_dev];
 		dev->irq = irq[this_dev];
@@ -419,14 +419,13 @@
 		if (register_netdev(dev) != 0) {
 			printk(KERN_WARNING "hp.c: No HP 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;
 }
 
@@ -446,7 +445,7 @@
 			kfree(priv);
 		}
 	}
-	unlock_8390_module();
+	unload_8390_module();
 }
 #endif /* MODULE */