From 290080d67594f6499a80592f1c0b5a24d98e53c6 Mon Sep 17 00:00:00 2001
From: Greg KH <gregkh@suse.de>
Date: Wed, 17 Aug 2005 17:33:11 -0700
Subject: [PATCH] --- yaml --- r: 5861 b: refs/heads/master c:
 518e6540831c69422faecceee8f964bd439ac9d0 h: refs/heads/master i:   5859:
 9db27d901a569790a09444146e6e48979412d55c v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/base/bus.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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);