patch-2.3.99-pre7 linux/drivers/net/3c501.c

• Lines: 82
• Date: Wed May 3 01:45:19 2000
• Orig file: v2.3.99-pre6/linux/drivers/net/3c501.c
• Orig date: Thu Feb 10 17:11:09 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/net/3c501.c linux/drivers/net/3c501.c
@@ -243,7 +243,7 @@
 	if (base_addr > 0x1ff)	/* Check a single specified location. */
 		return el1_probe1(dev, base_addr);
 	else if (base_addr != 0)	/* Don't probe at all. */
-		return ENXIO;
+		return -ENXIO;
 
 	for (i = 0; netcard_portlist[i]; i++)
 	{
@@ -254,7 +254,7 @@
 			return 0;
 	}
 
-	return ENODEV;
+	return -ENODEV;
 }
 #endif
 
@@ -303,13 +303,14 @@
 		mname = "NP943";
     	}
     	else
-		return ENODEV;
+		return -ENODEV;
 
 	/*
 	 *	Grab the region so we can find the another board if autoIRQ fails.
 	 */
 
-	request_region(ioaddr, EL1_IO_EXTENT,"3c501");
+	if (!request_region(ioaddr, EL1_IO_EXTENT,"3c501"))
+		return -ENODEV;
 
 	/*
 	 *	We auto-IRQ by shutting off the interrupt line and letting it float
@@ -331,7 +332,7 @@
 		{
 			printk("%s probe at %#x failed to detect IRQ line.\n",
 				mname, ioaddr);
-			return EAGAIN;
+			return -EAGAIN;
 		}
 	}
 
@@ -406,11 +407,15 @@
 	struct net_local *lp = (struct net_local *)dev->priv;
 	unsigned long flags;
 
+	MOD_INC_USE_COUNT;
+
 	if (el_debug > 2)
 		printk("%s: Doing el_open()...", dev->name);
 
-	if (request_irq(dev->irq, &el_interrupt, 0, "3c501", dev))
+	if (request_irq(dev->irq, &el_interrupt, 0, "3c501", dev)) {
+		MOD_DEC_USE_COUNT;
 		return -EAGAIN;
+	}
 
 	spin_lock_irqsave(&lp->lock, flags);
 	el_reset(dev);
@@ -419,7 +424,6 @@
 	lp->txing = 0;		/* Board in RX mode */
 	outb(AX_RX, AX_CMD);	/* Aux control, irq and receive enabled */
 	netif_start_queue(dev);
-	MOD_INC_USE_COUNT;
 	return 0;
 }
 
@@ -917,11 +921,9 @@
 
 #ifdef MODULE
 
-static char devicename[9] = { 0, };
-
 static struct net_device dev_3c501 =
 {
-	devicename, /* device name is inserted by linux/drivers/net/net_init.c */
+	"", /* device name is inserted by linux/drivers/net/net_init.c */
 	0, 0, 0, 0,
 	0x280, 5,
 	0, 0, 0, NULL, el1_probe