Merge 3.4-rc5 into driver-core-next

[karo-tx-linux.git] / lib / kobject.c

diff --git a/lib/kobject.c b/lib/kobject.c
index aeefa8bc8b1c2dac1493703ff2f209ce894938f9..38fcc60e661b7f03da71f2dd47a8699a01dbf600 100644 (file)
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -47,13 +47,11 @@ static int populate_dir(struct kobject *kobj)
 static int create_dir(struct kobject *kobj)
 {
        int error = 0;
-       if (kobject_name(kobj)) {
-               error = sysfs_create_dir(kobj);
-               if (!error) {
-                       error = populate_dir(kobj);
-                       if (error)
-                               sysfs_remove_dir(kobj);
-               }
+       error = sysfs_create_dir(kobj);
+       if (!error) {
+               error = populate_dir(kobj);
+               if (error)
+                       sysfs_remove_dir(kobj);
        }
        return error;
 }