Commit d377e85b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

[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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 479f6ea8
...@@ -270,10 +270,9 @@ int bus_add_device(struct device * dev) ...@@ -270,10 +270,9 @@ int bus_add_device(struct device * dev)
if (bus) { if (bus) {
pr_debug("bus %s: add device %s\n", bus->name, dev->bus_id); 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); 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) { if (!error) {
sysfs_create_link(&bus->devices.kobj, &dev->kobj, dev->bus_id); sysfs_create_link(&bus->devices.kobj, &dev->kobj, dev->bus_id);
sysfs_create_link(&dev->kobj, &dev->bus->subsys.kset.kobj, "bus"); sysfs_create_link(&dev->kobj, &dev->bus->subsys.kset.kobj, "bus");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment