Merge tag 'pm-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

[linux-2.6-block.git] / kernel / power / suspend.c

diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index fa3bf161d13f79a6d28dc891d3b5708871e4a969..e3ae93bbcb9b50d487727bee16f63f67d66442ac 100644 (file)
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -192,6 +192,7 @@ static int __init mem_sleep_default_setup(char *str)
                if (mem_sleep_labels[state] &&
                    !strcmp(str, mem_sleep_labels[state])) {
                        mem_sleep_default = state;
+                       mem_sleep_current = state;
                        break;
                }
 
@@ -367,7 +368,6 @@ static int suspend_prepare(suspend_state_t state)
        if (!error)
                return 0;
 
-       suspend_stats.failed_freeze++;
        dpm_save_failed_step(SUSPEND_FREEZE);
        pm_notifier_call_chain(PM_POST_SUSPEND);
  Restore:
@@ -617,12 +617,7 @@ int pm_suspend(suspend_state_t state)
 
        pr_info("suspend entry (%s)\n", mem_sleep_labels[state]);
        error = enter_state(state);
-       if (error) {
-               suspend_stats.fail++;
-               dpm_save_failed_errno(error);
-       } else {
-               suspend_stats.success++;
-       }
+       dpm_save_errno(error);
        pr_info("suspend exit\n");
        return error;
 }