1 files changed, 19 insertions, 4 deletions

diff --git a/kernel/power/power.h b/kernel/power/power.h
index 0c4defe6d3b8..98f3622d7407 100644
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -177,13 +177,11 @@ extern const char *const pm_states[];
 
 extern bool valid_state(suspend_state_t state);
 extern int suspend_devices_and_enter(suspend_state_t state);
-extern int enter_state(suspend_state_t state);
 #else /* !CONFIG_SUSPEND */
 static inline int suspend_devices_and_enter(suspend_state_t state)
 {
         return -ENOSYS;
 }
-static inline int enter_state(suspend_state_t state) { return -ENOSYS; }
 static inline bool valid_state(suspend_state_t state) { return false; }
 #endif /* !CONFIG_SUSPEND */
 
@@ -231,8 +229,25 @@ extern int pm_test_level;
 #ifdef CONFIG_SUSPEND_FREEZER
 static inline int suspend_freeze_processes(void)
 {
-        int error = freeze_processes();
-        return error ? : freeze_kernel_threads();
+        int error;
+
+        error = freeze_processes();
+        /*
+         * freeze_processes() automatically thaws every task if freezing
+         * fails. So we need not do anything extra upon error.
+         */
+        if (error)
+                return error;
+
+        error = freeze_kernel_threads();
+        /*
+         * freeze_kernel_threads() thaws only kernel threads upon freezing
+         * failure. So we have to thaw the userspace tasks ourselves.
+         */
+        if (error)
+                thaw_processes();
+
+        return error;
 }
 
 static inline void suspend_thaw_processes(void)