---

yaml --- r: 86094 b: refs/heads/master c: 0763446 h: refs/heads/master v: v3
git-mirror · Feb 21, 2008 · c3d5d7e · c3d5d7e
1 parent 5349249
commit c3d5d7e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -658,17 +658,18 @@ 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;
 	priv->kobj.kset = bus->p->drivers_kset;
 	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);