From c3d5d7ed618940a58c449bcbdfba674ca2766cb4 Mon Sep 17 00:00:00 2001
From: Cornelia Huck <cornelia.huck@de.ibm.com>
Date: Mon, 18 Feb 2008 17:04:25 +0100
Subject: [PATCH] --- yaml --- r: 86094 b: refs/heads/master c:
 0763446429e46fd973f507f79900b95eb8aae2e4 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 64af3492ec1c..02e36ce94e16 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7199677d2e919edc75d1fb8856c98cd0c1bbcfc5
+refs/heads/master: 0763446429e46fd973f507f79900b95eb8aae2e4
diff --git a/trunk/drivers/base/bus.c b/trunk/drivers/base/bus.c
index 055989e94799..2d207ad30336 100644
--- a/trunk/drivers/base/bus.c
+++ b/trunk/drivers/base/bus.c
@@ -658,9 +658,10 @@ int bus_add_driver(struct device_driver *drv)
 	pr_debug("bus: '%s': add driver %s\n", bus->name, drv->name);
 
 	priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-	if (!priv)
-		return -ENOMEM;
-
+	if (!priv) {
+		error = -ENOMEM;
+		goto out_put_bus;
+	}
 	klist_init(&priv->klist_devices, NULL, NULL);
 	priv->driver = drv;
 	drv->p = priv;
@@ -668,7 +669,7 @@ int bus_add_driver(struct device_driver *drv)
 	error = kobject_init_and_add(&priv->kobj, &driver_ktype, NULL,
 				     "%s", drv->name);
 	if (error)
-		goto out_put_bus;
+		goto out_unregister;
 
 	if (drv->bus->p->drivers_autoprobe) {
 		error = driver_attach(drv);