From d15f285fd41b6670086209d4804958c2cbe76f6c Mon Sep 17 00:00:00 2001
From: Cornelia Huck <cornelia.huck@de.ibm.com>
Date: Mon, 9 Jul 2007 11:39:18 -0700
Subject: [PATCH] --- yaml --- r: 59107 b: refs/heads/master c:
 dc0afa8388972a9ed7c2203cc46d8df1a4713f65 h: refs/heads/master i:   59105:
 279a726be37571d7a4c5abbdd314bf7abcc40525   59103:
 e33a4e4ad992128d993d54ac249f55c94cef2eb6 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/base/bus.c  | 6 ++++--
 trunk/drivers/base/core.c | 9 ++++++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 30b63f3ade25..37cb29f911fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93160c6397e460bc4c7ac15323fb698f91ef02e5
+refs/heads/master: dc0afa8388972a9ed7c2203cc46d8df1a4713f65
diff --git a/trunk/drivers/base/bus.c b/trunk/drivers/base/bus.c
index 7ff5aafe2167..f299e0d6abc4 100644
--- a/trunk/drivers/base/bus.c
+++ b/trunk/drivers/base/bus.c
@@ -622,7 +622,8 @@ int bus_add_driver(struct device_driver *drv)
 	if (error)
 		goto out_put_bus;
 	drv->kobj.kset = &bus->drivers;
-	if ((error = kobject_register(&drv->kobj)))
+	error = kobject_register(&drv->kobj);
+	if (error)
 		goto out_put_bus;
 
 	if (drv->bus->drivers_autoprobe) {
@@ -772,7 +773,8 @@ static int bus_add_attrs(struct bus_type * bus)
 
 	if (bus->bus_attrs) {
 		for (i = 0; attr_name(bus->bus_attrs[i]); i++) {
-			if ((error = bus_create_file(bus,&bus->bus_attrs[i])))
+			error = bus_create_file(bus,&bus->bus_attrs[i]);
+			if (error)
 				goto Err;
 		}
 	}
diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c
index dd40d78a023d..cff4fbfbb055 100644
--- a/trunk/drivers/base/core.c
+++ b/trunk/drivers/base/core.c
@@ -733,11 +733,14 @@ int device_add(struct device *dev)
 		}
 	}
 
-	if ((error = device_add_attrs(dev)))
+	error = device_add_attrs(dev);
+	if (error)
 		goto AttrsError;
-	if ((error = device_pm_add(dev)))
+	error = device_pm_add(dev);
+	if (error)
 		goto PMError;
-	if ((error = bus_add_device(dev)))
+	error = bus_add_device(dev);
+	if (error)
 		goto BusError;
 	kobject_uevent(&dev->kobj, KOBJ_ADD);
 	bus_attach_device(dev);