From d7a3b9e6ea6374c9ffbcdb7e4ca20d48a1cf1776 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 17 Dec 2007 15:54:39 -0400 Subject: [PATCH] --- yaml --- r: 75841 b: refs/heads/master c: c8e90d822bff3e0502d004facedb05859f98055f h: refs/heads/master i: 75839: 21843c0850fc18ce5e8ffa9c3bf7e858ac7ce976 v: v3 --- [refs] | 2 +- trunk/drivers/base/bus.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 3098bc0ddc78..a95557f9cc95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7dc72b2842381684b864750af31a5fb168dec764 +refs/heads/master: c8e90d822bff3e0502d004facedb05859f98055f diff --git a/trunk/drivers/base/bus.c b/trunk/drivers/base/bus.c index 937fc100b64a..aea579365f6d 100644 --- a/trunk/drivers/base/bus.c +++ b/trunk/drivers/base/bus.c @@ -643,15 +643,12 @@ int bus_add_driver(struct device_driver *drv) if (!priv) return -ENOMEM; - error = kobject_set_name(&priv->kobj, "%s", drv->name); - if (error) - goto out_put_bus; - priv->kobj.kset = bus->p->drivers_kset; - priv->kobj.ktype = &driver_ktype; klist_init(&priv->klist_devices, NULL, NULL); priv->driver = drv; drv->p = priv; - error = kobject_register(&priv->kobj); + priv->kobj.kset = bus->p->drivers_kset; + error = kobject_init_and_add(&priv->kobj, &driver_ktype, NULL, + "%s", drv->name); if (error) goto out_put_bus; @@ -681,6 +678,7 @@ int bus_add_driver(struct device_driver *drv) __FUNCTION__, drv->name); } + kobject_uevent(&priv->kobj, KOBJ_ADD); return error; out_unregister: kobject_unregister(&priv->kobj);