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

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
...@@ -153,6 +153,10 @@ static void kobject_init_internal(struct kobject *kobj) ...@@ -153,6 +153,10 @@ static void kobject_init_internal(struct kobject *kobj)
return; return;
kref_init(&kobj->kref); kref_init(&kobj->kref);
INIT_LIST_HEAD(&kobj->entry); 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) ...@@ -289,13 +293,8 @@ void kobject_init(struct kobject *kobj, struct kobj_type *ktype)
dump_stack(); dump_stack();
} }
kref_init(&kobj->kref); kobject_init_internal(kobj);
INIT_LIST_HEAD(&kobj->entry);
kobj->ktype = ktype; 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; return;
error: error:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment