Merge branch 'master' of ../linux-2.6/

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index bdc03f7e8424..ee9d1c8db0d6 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -415,7 +415,7 @@ EXPORT_SYMBOL_GPL(device_power_down);
  *      @dev:   Device.
  *      @state: Power state device is entering.
  */
-int suspend_device(struct device *dev, pm_message_t state)
+static int suspend_device(struct device *dev, pm_message_t state)
 {
         int error = 0;
 
@@ -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.