Merge commit 'v3.3-rc6' into next

1 files changed, 5 insertions, 5 deletions

diff --git a/kernel/power/main.c b/kernel/power/main.c
index 36e0f0903c32..9824b41e5a18 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2003 Patrick Mochel
  * Copyright (c) 2003 Open Source Development Lab
- * 
+ *
  * This file is released under the GPLv2
  *
  */
@@ -116,7 +116,7 @@ static ssize_t pm_test_store(struct kobject *kobj, struct kobj_attribute *attr,
         p = memchr(buf, '\n', n);
         len = p ? p - buf : n;
 
-        mutex_lock(&pm_mutex);
+        lock_system_sleep();
 
         level = TEST_FIRST;
         for (s = &pm_tests[level]; level <= TEST_MAX; s++, level++)
@@ -126,7 +126,7 @@ static ssize_t pm_test_store(struct kobject *kobj, struct kobj_attribute *attr,
                         break;
                 }
 
-        mutex_unlock(&pm_mutex);
+        unlock_system_sleep();
 
         return error ? error : n;
 }
@@ -240,7 +240,7 @@ struct kobject *power_kobj;
  *      'standby' (Power-On Suspend), 'mem' (Suspend-to-RAM), and
  *      'disk' (Suspend-to-Disk).
  *
- *      store() accepts one of those strings, translates it into the 
+ *      store() accepts one of those strings, translates it into the
  *      proper enumerated value, and initiates a suspend transition.
  */
 static ssize_t state_show(struct kobject *kobj, struct kobj_attribute *attr,
@@ -282,7 +282,7 @@ static ssize_t state_store(struct kobject *kobj, struct kobj_attribute *attr,
         /* First, check if we are requested to hibernate */
         if (len == 4 && !strncmp(buf, "disk", len)) {
                 error = hibernate();
-  goto Exit;
+                goto Exit;
         }
 
 #ifdef CONFIG_SUSPEND