Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus

[linux-2.6-block.git] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index 07ed21d64f92b39da9b683aa432efde6a14afdf0..f47e96b623088ae354947787ef17217cd32ae64e 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1106,7 +1106,7 @@ static int __dev_alloc_name(struct net *net, const char *name, char *buf)
         * when the name is long and there isn't enough space left
         * for the digits, or if all bits are used.
         */
-       return p ? -ENFILE : -EEXIST;
+       return -ENFILE;
 }
 
 static int dev_alloc_name_ns(struct net *net,