Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 3 insertions, 0 deletions

diff --git a/lib/kobject.c b/lib/kobject.c
index a6dec32f2dd..bacf6fe4f7a 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -218,6 +218,9 @@ int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
         const char *old_name = kobj->name;
         char *s;
 
+        if (kobj->name && !fmt)
+                return 0;
+
         kobj->name = kvasprintf(GFP_KERNEL, fmt, vargs);
         if (!kobj->name)
                 return -ENOMEM;