[PATCH] driver core: Fix up the device_attach() error handling in bus_add_device()

Don't error out if something "bad" happens when trying to bind a driver to a
device.  We want the sysfs attributes to be present for later when we try to
tear down the device.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 43722af90bddf2e01343bc24de33e25668952237..c3fac7fd555e6e45debce0501c8643b36d58640e 100644 (file)
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -270,10 +270,9 @@ int bus_add_device(struct device * dev)
 
        if (bus) {
                pr_debug("bus %s: add device %s\n", bus->name, dev->bus_id);
-               error = device_attach(dev);
+               device_attach(dev);
                klist_add_tail(&bus->klist_devices, &dev->knode_bus);
-               if (error >= 0)
-                       error = device_add_attrs(bus, dev);
+               error = device_add_attrs(bus, dev);
                if (!error) {
                        sysfs_create_link(&bus->devices.kobj, &dev->kobj, dev->bus_id);
                        sysfs_create_link(&dev->kobj, &dev->bus->subsys.kset.kobj, "bus");