X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=lib%2Fkobject.c;h=b512b746d2aff464e1c18a01c53300ef7b6e68f4;hb=59b9005692d4c8b5d73cfc41aa7229f47be163a9;hp=bacf6fe4f7a0347bb958ebc85a059ab582eb93b4;hpb=d585a021c0b10b0477d6b608c53e1feb8cde0507;p=linux-2.6-block.git

diff --git a/lib/kobject.c b/lib/kobject.c
index bacf6fe4f7a0..b512b746d2af 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -793,11 +793,16 @@ static struct kset *kset_create(const char *name,
 				struct kobject *parent_kobj)
 {
 	struct kset *kset;
+	int retval;
 
 	kset = kzalloc(sizeof(*kset), GFP_KERNEL);
 	if (!kset)
 		return NULL;
-	kobject_set_name(&kset->kobj, name);
+	retval = kobject_set_name(&kset->kobj, name);
+	if (retval) {
+		kfree(kset);
+		return NULL;
+	}
 	kset->uevent_ops = uevent_ops;
 	kset->kobj.parent = parent_kobj;