[NET]: Make register_netdevice return correct error when driver init function fails.

385016f2 · Andrew Morton · David S. Miller · f290bfd3 · 385016f2
Commit 385016f2 authored Oct 18, 2003 by Andrew Morton Committed by David S. Miller Oct 18, 2003
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

net/core/dev.c net/core/dev.c +8 -3

No files found.
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2634,9 +2634,14 @@ int register_netdevice(struct net_device *dev)
 	dev->iflink = -1;

 	/* Init, if this function is available */
+	if (dev->init) {
+		ret = dev->init(dev);
+		if (ret) {
+			if (ret > 0)
 				ret = -EIO;
-	if (dev->init && dev->init(dev))
 			goto out_err;
+		}
+	}

 	dev->ifindex = dev_new_index();
 	if (dev->iflink == -1)