driver core fixes: bus_add_device() cleanup on error
PATCH 5/9 driver core fixes: bus_add_device() cleanup on error
From: Cornelia Huck <[email protected]>
Correct cleanup in the error path of bus_add_device().
Signed-off-by Cornelia Huck <[email protected]>
--- drivers/base/bus.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/base/bus.c +15 -4
@@ -387,18 +387,29 @@ 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 =make_deprecated_bus_links (dev); +if (error) + goto out_deprecated; } -out: +return 0 ; + +out_deprecated: +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; }