3 files changed, 9 insertions, 5 deletions

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 055989e94799..2d207ad30336 100644
--- a/drivers/base/bus.c
+++ b/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);
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index ba75184c653c..bf31a0170a48 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -120,6 +120,9 @@ EXPORT_SYMBOL_GPL(driver_remove_file);
 
 /**
  * driver_add_kobj - add a kobject below the specified driver
+ * @drv: requesting device driver
+ * @kobj: kobject to add below this driver
+ * @fmt: format string that names the kobject
  *
  * You really don't want to do this, this is only here due to one looney
  * iseries driver, go poke those developers if you are annoyed about
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index a96ca86a7b4a..ee9d1c8db0d6 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -479,7 +479,6 @@ static int dpm_suspend(pm_message_t state)
                         mutex_lock(&dpm_list_mtx);
                         if (list_empty(&dev->power.entry))
                                 list_add(&dev->power.entry, &dpm_locked);
-                        mutex_unlock(&dpm_list_mtx);
                         break;
                 }
                 mutex_lock(&dpm_list_mtx);
@@ -523,6 +522,7 @@ static void lock_all_devices(void)
 
 /**
  *      device_suspend - Save state and stop all devices in system.
+ *      @state: new power management state
  *
  *      Prevent new devices from being registered, then lock all devices
  *      and suspend them.