mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2024-12-29 09:13:38 +00:00
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: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
d47846c586
commit
a4573c488d
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user