[5/9] driver core fixes: bus_add_device() cleanup on error

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]


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(-)

--- linux-2.6-CH.orig/drivers/base/bus.c
+++ linux-2.6-CH/drivers/base/bus.c
@@ -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;
+	return 0;
+	sysfs_remove_link(&dev->kobj, "subsystem");
+	sysfs_remove_link(&bus->devices.kobj, dev->bus_id);
+	device_remove_attrs(bus, dev);
+	put_bus(dev->bus);
 	return error;
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]
  Powered by Linux