From b1cbcacd0986e4a4e5de6c997e0c631b89ab3455 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 17 Dec 2007 15:54:39 -0400 Subject: [PATCH] --- yaml --- r: 75799 b: refs/heads/master c: dd002e807486f9858147c073069a37ba625baad8 h: refs/heads/master i: 75797: d41d2821ead7fb12afc80ea2e2f2bcb5b89521b9 75795: 9dd882a1c0e0c69bb7cedbacb5e39a01a916cf88 75791: 6cfa365a86e6e28b1f517c3997db948e6cecb0cf v: v3 --- [refs] | 2 +- trunk/drivers/firmware/edd.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3df019c53af6..9199ea062c7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35be0681983752116a8161ad3b30e830963108a4 +refs/heads/master: dd002e807486f9858147c073069a37ba625baad8 diff --git a/trunk/drivers/firmware/edd.c b/trunk/drivers/firmware/edd.c index ddcc95793068..dc0b87b13505 100644 --- a/trunk/drivers/firmware/edd.c +++ b/trunk/drivers/firmware/edd.c @@ -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; }