Driver core: Don't ignore error returns from probing

This patch (as797) fixes device_add() in the driver core.  It needs to
pay attention when the driver for a new device reports an error.

At the same time, since bus_remove_device() undoes the effects of both
bus_add_device() and bus_attach_device(), it needs to check whether
the bus_attach_device step failed.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index d516f7d5f16884bca1a10bd25c40f3f7f37a1f54..d7c5ea246a0baa21474cad3fa5a78f8553fa4a69 100644 (file)
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -439,8 +439,10 @@ void bus_remove_device(struct device * dev)
                sysfs_remove_link(&dev->kobj, "bus");
                sysfs_remove_link(&dev->bus->devices.kobj, dev->bus_id);
                device_remove_attrs(dev->bus, dev);
-               dev->is_registered = 0;
-               klist_del(&dev->knode_bus);
+               if (dev->is_registered) {
+                       dev->is_registered = 0;
+                       klist_del(&dev->knode_bus);
+               }
                pr_debug("bus %s: remove device %s\n", dev->bus->name, dev->bus_id);
                device_release_driver(dev);
                put_bus(dev->bus);

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 41f3dca55cd080d36241f176166c6f6c09494880..68ad11af22b41e307277f3826be989c37dbe2bbf 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -479,7 +479,8 @@ int device_add(struct device *dev)
        if ((error = bus_add_device(dev)))
                goto BusError;
        kobject_uevent(&dev->kobj, KOBJ_ADD);
-       bus_attach_device(dev);
+       if ((error = bus_attach_device(dev)))
+               goto AttachError;
        if (parent)
                klist_add_tail(&dev->knode_parent, &parent->klist_children);
 
@@ -498,6 +499,8 @@ int device_add(struct device *dev)
        kfree(class_name);
        put_device(dev);
        return error;
+ AttachError:
+       bus_remove_device(dev);
  BusError:
        device_pm_remove(dev);
  PMError: