patch-1.3.19 linux/drivers/net/apricot.c

• Lines: 30
• Date: Tue Aug 15 18:08:33 1995
• Orig file: v1.3.18/linux/drivers/net/apricot.c
• Orig date: Wed Aug 9 14:55:39 1995

diff -u --recursive --new-file v1.3.18/linux/drivers/net/apricot.c linux/drivers/net/apricot.c
@@ -714,7 +714,7 @@
     if(memcmp(eth_addr,"\x00\x00\x49",3)!= 0)
     	return ENODEV;
 
-    request_region(ioaddr, APRICOT_TOTAL_SIZE,"apricot");
+    request_region(ioaddr, APRICOT_TOTAL_SIZE, "apricot");
 
     dev->base_addr = ioaddr;
     ether_setup(dev);
@@ -1014,8 +1014,9 @@
 
 #ifdef MODULE
 char kernel_version[] = UTS_RELEASE;
+static char devicename[9] = { 0, };
 static struct device dev_apricot = {
-  "        ", /* device name inserted by /linux/drivers/net/net_init.c */
+  devicename, /* device name inserted by /linux/drivers/net/net_init.c */
   0, 0, 0, 0,
   0x300, 10,
   0, 0, 0, NULL, apricot_probe };
@@ -1043,6 +1044,9 @@
     unregister_netdev(&dev_apricot);
     kfree_s((void *)dev_apricot.mem_start, sizeof(struct i596_private) + 0xf);
     dev_apricot.priv = NULL;
+
+    /* If we don't do this, we can't re-insmod it later. */
+    release_region(dev_apricot.base_addr, APRICOT_TOTAL_SIZE);
   }
 }
 #endif /* MODULE */