patch-2.3.99-pre7 linux/drivers/net/82596.c

• Lines: 23
• Date: Tue May 2 12:40:59 2000
• Orig file: v2.3.99-pre6/linux/drivers/net/82596.c
• Orig date: Wed Apr 26 16:34:07 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/net/82596.c linux/drivers/net/82596.c
@@ -1152,7 +1152,8 @@
 		if (memcmp(eth_addr, "\x00\x00\x49", 3) != 0)
 			return -ENODEV;
 
-		request_region(ioaddr, I596_TOTAL_SIZE, "i596");
+		if (!request_region(ioaddr, I596_TOTAL_SIZE, "i596"))
+			return -ENODEV;
 
 		dev->base_addr = ioaddr;
 		dev->irq = 10;
@@ -1493,11 +1494,9 @@
 #endif
 
 #ifdef MODULE
-static char devicename[9] =
-{0,};
 static struct net_device dev_82596 =
 {
-	devicename,	/* device name inserted by drivers/net/net_init.c */
+	"",	/* device name inserted by drivers/net/net_init.c */
 	0, 0, 0, 0,
 	0, 0,		/* base, irq */
 	0, 0, 0, NULL, i82596_probe};