Stop using kobject_register, as this way we can control the sending of

the uevent properly, after everything is properly initialized.
Cc: Jens Axboe

Cc: Kay Sievers

Signed-off-by: Greg Kroah-Hartman

---

 drivers/block/pktcdvd.c |    9 +++++----

 1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c

index 17da699..d1ee383 100644

--- a/drivers/block/pktcdvd.c

+++ b/drivers/block/pktcdvd.c

@@ -110,17 +110,18 @@ static struct pktcdvd_kobj* pkt_kobj_create(struct pktcdvd_device *pd,

 					struct kobj_type* ktype)

 {

 	struct pktcdvd_kobj *p;

+	int error;

+

 	p = kzalloc(sizeof(*p), GFP_KERNEL);

 	if (!p)

 		return NULL;

-	kobject_set_name(&p->kobj, "%s", name);

-	p->kobj.parent = parent;

-	p->kobj.ktype = ktype;

 	p->pd = pd;

-	if (kobject_register(&p->kobj) != 0) {

+	error = kobject_init_and_add(&p->kobj, ktype, parent, "%s", name);

+	if (error) {

 		kobject_put(&p->kobj);

 		return NULL;

 	}

+	kobject_uevent(&p->kobj, KOBJ_ADD);

 	return p;

 }

 /*

--

1.5.3.8
--

unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

the body of a message to majordomo@vger.kernel.org

More majordomo info at  http://vger.kernel.org/majordomo-info.html

Please read the FAQ at  http://www.tux.org/lkml/