diff --git a/[refs] b/[refs] index 2c777654136f..b3e9866b75cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a14388904ca67197c9a531dba2358d8131697865 +refs/heads/master: 372254018eb1b65ee69210d11686bfc65c8d84db diff --git a/trunk/drivers/base/bus.c b/trunk/drivers/base/bus.c index 48718b7f4fa0..76656acd00d4 100644 --- a/trunk/drivers/base/bus.c +++ b/trunk/drivers/base/bus.c @@ -188,6 +188,11 @@ static ssize_t driver_bind(struct device_driver *drv, up(&dev->sem); if (dev->parent) up(&dev->parent->sem); + + if (err > 0) /* success */ + err = count; + else if (err == 0) /* driver didn't accept device */ + err = -ENODEV; } put_device(dev); put_bus(bus);