From f60936f7c8b9a7e4a4270016f2fac7f536199dcf Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 22 Jun 2005 16:09:05 -0700
Subject: [PATCH] --- yaml --- r: 2843 b: refs/heads/master c:
 d377e85b537a5e166272f937da6ba84350676b6e h: refs/heads/master i:   2841:
 65aa52104fb749adbc984acf4f9da78c4f854d1b   2839:
 1d36b71e7cc0817f60f97550816153735eea0c56 v: v3

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

diff --git a/[refs] b/[refs]
index c1e52d4e3d20..3c8f6b997521 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 479f6ea85e513551510ad52f37e69e1c596ad356
+refs/heads/master: d377e85b537a5e166272f937da6ba84350676b6e
diff --git a/trunk/drivers/base/bus.c b/trunk/drivers/base/bus.c
index 43722af90bdd..c3fac7fd555e 100644
--- a/trunk/drivers/base/bus.c
+++ b/trunk/drivers/base/bus.c
@@ -270,10 +270,9 @@ int bus_add_device(struct device * dev)
 
 	if (bus) {
 		pr_debug("bus %s: add device %s\n", bus->name, dev->bus_id);
-		error = device_attach(dev);
+		device_attach(dev);
 		klist_add_tail(&bus->klist_devices, &dev->knode_bus);
-		if (error >= 0)
-			error = device_add_attrs(bus, dev);
+		error = device_add_attrs(bus, dev);
 		if (!error) {
 			sysfs_create_link(&bus->devices.kobj, &dev->kobj, dev->bus_id);
 			sysfs_create_link(&dev->kobj, &dev->bus->subsys.kset.kobj, "bus");