diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-02-27 11:07:10 -0800 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-02-27 11:07:10 -0800 |
| commit | 9ef64cb4320df821638b508f79aa8b858cca99f0 (patch) | |
| tree | 4efbf0854234f89c6f4413077ec795fc669b5b0a /drivers/base/bus.c | |
| parent | 6f157c1d268d5888ca44c589dccd01729c4172f6 (diff) | |
| parent | 7704a8b6fc4a8f51599eb2af4dcf1e2ac9c7e576 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 055989e9479..2d207ad3033 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); |