patch-2.4.0-test10 linux/drivers/net/jazzsonic.c

• Lines: 15
• Date: Mon Oct 30 12:24:21 2000
• Orig file: v2.4.0-test9/linux/drivers/net/jazzsonic.c
• Orig date: Thu Aug 26 14:28:05 1999

diff -u --recursive --new-file v2.4.0-test9/linux/drivers/net/jazzsonic.c linux/drivers/net/jazzsonic.c
@@ -144,12 +144,9 @@
 	return -ENODEV;
     }
     
-    request_region(base_addr, 0x100, "SONIC");
+    if (!request_region(base_addr, 0x100, dev->name))
+    	return -EBUSY;
     
-    /* Allocate a new 'dev' if needed. */
-    if (dev == NULL)
-      dev = init_etherdev(0, sizeof(struct sonic_local));
-
     if (sonic_debug  &&  version_printed++ == 0)
       printk(version);