diff --git a/[refs] b/[refs]
index e139984b5bcf..0d6d2124b3dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64c7f304b81a9a92dc7046c97a10427a5997dc07
+refs/heads/master: 0696c3a8acd3b7c3186dd231d65d97e05a75189f
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index ea23353e6251..3ed09f8ecbf8 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -5437,6 +5437,10 @@ int register_netdevice(struct net_device *dev)
 
 	dev->iflink = -1;
 
+	ret = dev_get_valid_name(dev, dev->name);
+	if (ret < 0)
+		goto out;
+
 	/* Init, if this function is available */
 	if (dev->netdev_ops->ndo_init) {
 		ret = dev->netdev_ops->ndo_init(dev);
@@ -5447,10 +5451,6 @@ int register_netdevice(struct net_device *dev)
 		}
 	}
 
-	ret = dev_get_valid_name(dev, dev->name);
-	if (ret < 0)
-		goto err_uninit;
-
 	dev->ifindex = dev_new_index(net);
 	if (dev->iflink == -1)
 		dev->iflink = dev->ifindex;