commit b1fc5505e0dbcc3fd7c75bfe6bee39ec50080963
author <herbert@gondor.apana.org.au> Thu May 12 20:11:55 2005 -0400
committer Jeff Garzik <jgarzik@pobox.com> Thu May 12 20:11:55 2005 -0400
tree f8c0bb679dc8e72816e16820c3dbcccf924097eb
parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5

[netdrvr] Fix register_netdev() races in older ISA net drivers

drivers/net/eexpress.c

diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index fc8e794..82bd356 100644
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -436,11 +436,8 @@
 	netdev_boot_setup_check(dev);
 
 	err = do_express_probe(dev);
-	if (!err) {
-		err = register_netdev(dev);
-		if (!err)
-			return dev;
-	}
+	if (!err)
+		return dev;
 	free_netdev(dev);
 	return ERR_PTR(err);
 }
@@ -1205,7 +1202,8 @@
 	dev->set_multicast_list = &eexp_set_multicast;
 	dev->tx_timeout = eexp_timeout;
 	dev->watchdog_timeo = 2*HZ;
-	return 0;
+
+	return register_netdev(dev);
 }
 
 /*
@@ -1716,7 +1714,7 @@
 				break;
 			printk(KERN_NOTICE "eexpress.c: Module autoprobe not recommended, give io=xx.\n");
 		}
-		if (do_express_probe(dev) == 0 && register_netdev(dev) == 0) {
+		if (do_express_probe(dev) == 0) {
 			dev_eexp[this_dev] = dev;
 			found++;
 			continue;