From e9fb9ec116934f197a23a469cc1206a2d4ec3ed5 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sun, 15 Nov 2009 23:30:24 +0000
Subject: [PATCH] --- yaml --- r: 168753 b: refs/heads/master c:
 91e9c07bd635353d1a278bdb38dbb56ac371bcb8 h: refs/heads/master i:   168751:
 1f8f32d79ef8e2a6a67dcafe0dec3e3ccc3b3402 v: v3

---
 [refs]               |  2 +-
 trunk/net/core/dev.c | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index f4ca6494e9c1..fa2baceaca43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e29d4363174949a7a4e46f670993d7ff43342c1c
+refs/heads/master: 91e9c07bd635353d1a278bdb38dbb56ac371bcb8
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index b8f74cfb1bfd..fe10551d3671 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -942,14 +942,15 @@ int dev_change_name(struct net_device *dev, const char *newname)
 	ret = notifier_to_errno(ret);
 
 	if (ret) {
-		if (err) {
-			printk(KERN_ERR
-			       "%s: name change rollback failed: %d.\n",
-			       dev->name, ret);
-		} else {
+		/* err >= 0 after dev_alloc_name() or stores the first errno */
+		if (err >= 0) {
 			err = ret;
 			memcpy(dev->name, oldname, IFNAMSIZ);
 			goto rollback;
+		} else {
+			printk(KERN_ERR
+			       "%s: name change rollback failed: %d.\n",
+			       dev->name, ret);
 		}
 	}