Merge branch 'upstream'

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 48718b7f4fa0..76656acd00d4 100644
--- a/drivers/base/bus.c
+++ b/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);