Skip to content

Commit

Permalink
[PATCH] driver core: Fix up the device_attach() error handling in bus…
Browse files Browse the repository at this point in the history
…_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>
  • Loading branch information
Greg Kroah-Hartman committed Jun 23, 2005
1 parent 479f6ea commit d377e85
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/base/bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit d377e85

Please sign in to comment.