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

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 35be0681
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -721,13 +721,13 @@ edd_device_register(struct edd_device *edev, int i)
	if (!edev)
		return 1;
	edd_dev_set_info(edev, i);
	kobject_set_name(&edev->kobj, "int13_dev%02x",
			 0x80 + i);
	edev->kobj.kset = edd_kset;
	edev->kobj.ktype = &edd_ktype;
	error = kobject_register(&edev->kobj);
	if (!error)
	error = kobject_init_and_add(&edev->kobj, &edd_ktype, NULL,
				     "int13_dev%02x", 0x80 + i);
	if (!error) {
		edd_populate_dir(edev);
		kobject_uevent(&edev->kobj, KOBJ_ADD);
	}
	return error;
}