lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

driver core: don't fail attaching the device if it cannot be bound

Browse Source 
Don't fail bus_attach_device() if the device cannot be bound.

If dev->driver has been specified, reset it to NULL if device_bind_driver()
failed and add the device as an unbound device.  As a result,
bus_attach_device() now cannot fail, and we can remove some checking from
device_add().

Also remove an unneeded check in bus_rescan_devices_helper().

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Cornelia Huck
2007-02-05 16:15:26 -08:00
committed by Greg Kroah-Hartman
parent eed40d3ad2
commit c6a46696f9
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/base/bus.c
View File

@@ -447,7 +447,7 @@ out_put:
* - Add device to bus's list of devices.
* - Try to attach to driver.
*/
int bus_attach_device(struct device * dev)
void bus_attach_device(struct device * dev)
{
struct bus_type *bus = dev->bus;
int ret = 0;
@@ -456,13 +456,12 @@ int bus_attach_device(struct device * dev)
dev->is_registered = 1;
if (bus->drivers_autoprobe)
ret = device_attach(dev);
if (ret >= 0) {
WARN_ON(ret < 0);
if (ret >= 0)
klist_add_tail(&dev->knode_bus, &bus->klist_devices);
ret = 0;
} else
else
dev->is_registered = 0;
}
return ret;
}
/**
@@ -669,8 +668,6 @@ static int __must_check bus_rescan_devices_helper(struct device *dev,
ret = device_attach(dev);
if (dev->parent)
up(&dev->parent->sem);
if (ret > 0)
ret = 0;
}
return ret < 0 ? ret : 0;
}