From 34c90b456d6dcab32b56e42ce9474975206d63c9 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Wed, 21 Apr 2010 23:53:27 +0000
Subject: [PATCH] --- yaml --- r: 190239 b: refs/heads/master c:
 80032cffb95edff4fc216b1cb21682257be326b7 h: refs/heads/master i:   190237:
 c04849f4f651a6fa7a7f19eaf6c821cebd20239a   190235:
 a8f537bb8350cd2378fb7a7251fce6c1c9fc0ea2   190231:
 7cfc5f35e0cc1bb5e4b40aa0fd579b60da79a7d4   190223:
 018cbe55b84d777ae06eb4a454d0a13af643ff5d   190207:
 70b22e19b0010161132c94feebf72163c0a434c5 v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/rtnetlink.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2723503f7ec8..6532e6c03d55 100644
--- 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
index 4568120d8533..fe776c9ddeca 100644
--- 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)