Messages in this thread Patch in this message | | | Date | Thu, 14 Sep 2006 09:40:22 +0200 | From | Cornelia Huck <> | Subject | Re: [07/12] driver core fixes: bus_add_device() cleanup on error |
| |
On Wed, 13 Sep 2006 10:27:02 -0700, Joe Perches <joe@perches.com> wrote:
> better to have a separate error return and a no error return
How about this one?
From: Cornelia Huck <cornelia.huck@de.ibm.com>
Correct cleanup in the error path of bus_add_device().
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
bus.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
--- linux-2.6.18-rc6/drivers/base/bus.c 2006-09-14 09:32:16.000000000 +0200 +++ linux-2.6.18-rc6+CH/drivers/base/bus.c 2006-09-14 09:35:30.000000000 +0200 @@ -372,19 +372,31 @@ int bus_add_device(struct device * dev) pr_debug("bus %s: add device %s\n", bus->name, dev->bus_id); error = device_add_attrs(bus, dev); if (error) - goto out; + goto out_put; error = sysfs_create_link(&bus->devices.kobj, &dev->kobj, dev->bus_id); if (error) - goto out; + goto out_id; error = sysfs_create_link(&dev->kobj, &dev->bus->subsys.kset.kobj, "subsystem"); if (error) - goto out; + goto out_subsys; error = sysfs_create_link(&dev->kobj, &dev->bus->subsys.kset.kobj, "bus"); + if (error) + goto out_create; + put_bus(dev->bus); } -out: + return 0; + +out_create: + sysfs_remove_link(&dev->kobj, "subsystem"); +out_subsys: + sysfs_remove_link(&bus->devices.kobj, dev->bus_id); +out_id: + device_remove_attrs(bus, dev); +out_put: + put_bus(dev->bus); return error; } - 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/
| |