---

yaml --- r: 190239 b: refs/heads/master c: 80032cf h: refs/heads/master i: 190237: c04849f 190235: a8f537b 190231: 7cfc5f3 190223: 018cbe5 190207: 70b22e1 v: v3
git-mirror · Apr 22, 2010 · 34c90b4 · 34c90b4
1 parent 345c970
commit 34c90b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4f914b58019f0e50d521bbbadfaee260d766f95
+refs/heads/master: 80032cffb95edff4fc216b1cb21682257be326b7
diff --git a/trunk/net/core/rtnetlink.c b/trunk/net/core/rtnetlink.c
@@ -1270,10 +1270,11 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
 			err = ops->newlink(net, dev, tb, data);
 		else
 			err = register_netdevice(dev);
-		if (err < 0 && !IS_ERR(dev)) {
+
+		if (err < 0 && !IS_ERR(dev))
 			free_netdev(dev);
+		if (err < 0)
 			goto out;
-		}
 
 		err = rtnl_configure_link(dev, ifm);
 		if (err < 0)