Commit dd002e807486f9858147c073069a37ba625baad8
1 parent
35be068198
Exists in
master
and in
7 other branches
Kobject: change drivers/firmware/edd.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: Matt Domsch <Matt_Domsch@dell.com> Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Showing 1 changed file with 5 additions and 5 deletions Side-by-side Diff
drivers/firmware/edd.c
| ... | ... | @@ -721,13 +721,13 @@ |
| 721 | 721 | if (!edev) |
| 722 | 722 | return 1; |
| 723 | 723 | edd_dev_set_info(edev, i); |
| 724 | - kobject_set_name(&edev->kobj, "int13_dev%02x", | |
| 725 | - 0x80 + i); | |
| 726 | 724 | edev->kobj.kset = edd_kset; |
| 727 | - edev->kobj.ktype = &edd_ktype; | |
| 728 | - error = kobject_register(&edev->kobj); | |
| 729 | - if (!error) | |
| 725 | + error = kobject_init_and_add(&edev->kobj, &edd_ktype, NULL, | |
| 726 | + "int13_dev%02x", 0x80 + i); | |
| 727 | + if (!error) { | |
| 730 | 728 | edd_populate_dir(edev); |
| 729 | + kobject_uevent(&edev->kobj, KOBJ_ADD); | |
| 730 | + } | |
| 731 | 731 | return error; |
| 732 | 732 | } |
| 733 | 733 |