diff options
| author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2008-02-18 17:04:25 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-22 00:27:07 +0100 |
| commit | 0763446429e46fd973f507f79900b95eb8aae2e4 (patch) | |
| tree | 9b6b0811c94e59e1e90e0f6a636e2e86b8918c01 /drivers/base/bus.c | |
| parent | driver-core: fix kernel-doc function parameters (diff) | |
| download | linux-0763446429e46fd973f507f79900b95eb8aae2e4.tar.xz linux-0763446429e46fd973f507f79900b95eb8aae2e4.zip | |
Driver core: Fix error handling in bus_add_driver().
- If the allocation of ->priv fails, the reference on the bus
must be dropped.
- If adding the kobject fails, kobject_put must be called to
clean things up.
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base/bus.c')
| -rw-r--r-- | drivers/base/bus.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 055989e94799..2d207ad30336 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -658,9 +658,10 @@ int bus_add_driver(struct device_driver *drv) pr_debug("bus: '%s': add driver %s\n", bus->name, drv->name); priv = kzalloc(sizeof(*priv), GFP_KERNEL); - if (!priv) - return -ENOMEM; - + if (!priv) { + error = -ENOMEM; + goto out_put_bus; + } klist_init(&priv->klist_devices, NULL, NULL); priv->driver = drv; drv->p = priv; @@ -668,7 +669,7 @@ int bus_add_driver(struct device_driver *drv) error = kobject_init_and_add(&priv->kobj, &driver_ktype, NULL, "%s", drv->name); if (error) - goto out_put_bus; + goto out_unregister; if (drv->bus->p->drivers_autoprobe) { error = driver_attach(drv); |