From 3b1f7138b7ad37181a14f5488e2bd0df92b0f941 Mon Sep 17 00:00:00 2001 From: yan Date: Fri, 20 Apr 2012 21:25:53 +0800 Subject: [PATCH] --- yaml --- r: 304045 b: refs/heads/master c: 6b9606106ba58d2bd80610f97e06fea58206b47c h: refs/heads/master i: 304043: 785951da2babfbfa8005dd5bbeef3c72c0b11ce3 v: v3 --- [refs] | 2 +- trunk/lib/kobject.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 4697d1a1d299..b153822be4d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9169c01236ab29ce55c93aaf22ec6ecc65c46d1a +refs/heads/master: 6b9606106ba58d2bd80610f97e06fea58206b47c diff --git a/trunk/lib/kobject.c b/trunk/lib/kobject.c index 21dee7c19afd..bbffa2110d43 100644 --- a/trunk/lib/kobject.c +++ b/trunk/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; }