X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=lib%2Fkobject.c;h=1699eb9161f34594a38cc28fbea1f0ab2db56893;hb=663d1ba2f1f66db43ab95350f965c1d9f2e3e5bc;hp=b46350c278370b3ea799fdd5e220befbb7b83a83;hpb=aad61439e6a00bdb72cb649e11f6e166590c5f66;p=linux-2.6-omap-h63xx.git

diff --git a/lib/kobject.c b/lib/kobject.c
index b46350c2783..1699eb9161f 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -205,7 +205,7 @@ int kobject_add(struct kobject * kobj)
 		else
 			printk("kobject_add failed for %s (%d)\n",
 			       kobject_name(kobj), error);
-		dump_stack();
+		 dump_stack();
 	}
 
 	return error;
@@ -407,6 +407,7 @@ static struct kobj_type dir_ktype = {
 struct kobject *kobject_add_dir(struct kobject *parent, const char *name)
 {
 	struct kobject *k;
+	int ret;
 
 	if (!parent)
 		return NULL;
@@ -418,7 +419,13 @@ struct kobject *kobject_add_dir(struct kobject *parent, const char *name)
 	k->parent = parent;
 	k->ktype = &dir_ktype;
 	kobject_set_name(k, name);
-	kobject_register(k);
+	ret = kobject_register(k);
+	if (ret < 0) {
+		printk(KERN_WARNING "kobject_add_dir: "
+			"kobject_register error: %d\n", ret);
+		kobject_del(k);
+		return NULL;
+	}
 
 	return k;
 }