Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4573c48 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

kobject: properly initialize ksets 



kset_initialize was calling kobject_init_internal() which didn't
initialize the kobject as well as kobject_init() was.  So have
kobject_init() call kobject_init_internal() and move the logic to
initalize the kobject there.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Hannes Reinecke <hare@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d47846c5

lib/kobject.c

+5 −6
Original line number Diff line number Diff line
@@ -153,6 +153,10 @@ static void kobject_init_internal(struct kobject *kobj) 
		return;

	kref_init(&kobj->kref);

	INIT_LIST_HEAD(&kobj->entry);

	kobj->state_in_sysfs = 0;

	kobj->state_add_uevent_sent = 0;

	kobj->state_remove_uevent_sent = 0;

	kobj->state_initialized = 1;

}
@@ -289,13 +293,8 @@ void kobject_init(struct kobject *kobj, struct kobj_type *ktype) 
		dump_stack();

	}



	kref_init(&kobj->kref);

	INIT_LIST_HEAD(&kobj->entry);

	kobject_init_internal(kobj);

	kobj->ktype = ktype;

	kobj->state_in_sysfs = 0;

	kobj->state_add_uevent_sent = 0;

	kobj->state_remove_uevent_sent = 0;

	kobj->state_initialized = 1;

	return;



error: