patch-2.4.0-prerelease linux/drivers/net/oaknet.c

Next file: linux/drivers/net/pcmcia/Makefile
Previous file: linux/drivers/net/ni52.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test12/linux/drivers/net/oaknet.c linux/drivers/net/oaknet.c
@@ -140,7 +140,7 @@
 		dev->base_addr = 0;
 
 		release_region(dev->base_addr, OAKNET_IO_SIZE);
-		return (ENODEV);
+		return (-ENODEV);
 	}
 
 	/*
@@ -148,7 +148,12 @@
 	 * our own device structure.
 	 */
 
-	dev = init_etherdev(0, 0);
+	dev = init_etherdev(NULL, 0);
+	if (!dev) {
+		release_region(dev->base_addr, OAKNET_IO_SIZE);
+		return (-ENOMEM);
+	}
+	SET_MODULE_OWNER(dev);
 	oaknet_devs = dev;
 
 	/*
@@ -238,7 +243,6 @@
 oaknet_open(struct net_device *dev)
 {
 	int status = ei_open(dev);
-	MOD_INC_USE_COUNT;
 	return (status);
 }
 
@@ -265,7 +269,6 @@
 oaknet_close(struct net_device *dev)
 {
 	int status = ei_close(dev);
-	MOD_DEC_USE_COUNT;
 	return (status);
 }
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)