diff --git a/[refs] b/[refs]
index 739dffed5d0f..b4613bb2043e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 099d44e869f1886b5eb02a5145ca97b5e4142e28
+refs/heads/master: 518e6540831c69422faecceee8f964bd439ac9d0
diff --git a/trunk/drivers/base/bus.c b/trunk/drivers/base/bus.c
index 96fe2f956754..ab53832d57e5 100644
--- a/trunk/drivers/base/bus.c
+++ b/trunk/drivers/base/bus.c
@@ -180,7 +180,9 @@ static ssize_t driver_bind(struct device_driver *drv,
 		up(&dev->sem);
 		put_device(dev);
 	}
-	return err;
+	if (err)
+		return err;
+	return count;
 }
 static DRIVER_ATTR(bind, S_IWUSR, NULL, driver_bind);