diff options
| author | Imre Deak <imre.deak@intel.com> | 2014-10-24 20:29:09 +0300 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2014-11-13 11:48:48 +0000 |
| commit | 228ed7285af306967be0505584fe318fc8d247fa (patch) | |
| tree | 94bb705d81ba9a3814b043bfdef8ab4c58649124 | |
| parent | b945baffbb5f821316056516fac72e0721213942 (diff) | |
PM / Sleep: fix async suspend_late/freeze_late error handling
commit 246ef766743618a7cab059d6c4993270075b173e upstream.
If an asynchronous suspend_late or freeze_late callback fails
during the SUSPEND, FREEZE or QUIESCE phases, we don't propagate the
corresponding error correctly, in effect ignoring the error and
continuing the suspend-to-ram/hibernation. During suspend-to-ram this
could leave some devices without a valid saved context, leading to a
failure to reinitialize them during resume. During hibernation this
could leave some devices active interfeering with the creation /
restoration of the hibernation image. Also this could leave the
corresponding devices without a valid saved context and failure to
reinitialize them during resume.
Fixes: de377b397272 (PM / sleep: Asynchronous threads for suspend_late)
Signed-off-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
| -rw-r--r-- | drivers/base/power/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index bf412961a934..1f6da3ad6db0 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1262,6 +1262,8 @@ static int dpm_suspend_late(pm_message_t state) } mutex_unlock(&dpm_list_mtx); async_synchronize_full(); + if (!error) + error = async_error; if (error) { suspend_stats.failed_suspend_late++; dpm_save_failed_step(SUSPEND_SUSPEND_LATE); |