dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Kobject: change drivers/pci/hotplug/pci_hotplug_core.c to use kobject_init_and_add 

Stop using kobject_register, as this way we can control the sending of
the uevent properly, after everything is properly initialized.

Cc: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2007-12-17 15:54:39 -04:00
parent 94f57f3368
commit 64dbcac3a1
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/pci/hotplug/pci_hotplug_core.c
View File

@ -630,19 +630,19 @@ int pci_hp_register (struct hotplug_slot *slot)
return -EINVAL;
}
kobject_set_name(&slot->kobj, "%s", slot->name);
slot->kobj.kset = pci_hotplug_slots_kset;
slot->kobj.ktype = &hotplug_slot_ktype;
/* this can fail if we have already registered a slot with the same name */
if (kobject_register(&slot->kobj)) {
err("Unable to register kobject");
slot->kobj.kset = pci_hotplug_slots_kset;
result = kobject_init_and_add(&slot->kobj, &hotplug_slot_ktype, NULL,
"%s", slot->name);
if (result) {
err("Unable to register kobject '%s'", slot->name);
return -EINVAL;
}
list_add (&slot->slot_list, &pci_hotplug_slot_list);
result = fs_add_slot (slot);
kobject_uevent(&slot->kobj, KOBJ_ADD);
dbg ("Added slot %s to the list\n", slot->name);
return result;
}