diff options
| author | Colin Cross <ccross@android.com> | 2012-07-18 18:55:26 -0700 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-07-23 15:00:35 +0530 |
| commit | 10f8a074405645069a28f48450238224f8111ee8 (patch) | |
| tree | b20a937cc4dbc1c4673fd3694f96adf55340b746 /drivers/base | |
| parent | 72b7bd1ac1ca7335690646201c86b13d5ff5cf2f (diff) | |
PM / Sleep: call early resume handlers when suspend_noirq fails
Commit cf579dfb82550e34de7ccf3ef090d8b834ccd3a9 (PM / Sleep: Introduce
"late suspend" and "early resume" of devices) introduced a bug where
suspend_late handlers would be called, but if dpm_suspend_noirq returned
an error the early_resume handlers would never be called. All devices
would end up on the dpm_late_early_list, and would never be resumed
again.
Fix it by calling dpm_resume_early when dpm_suspend_noirq returns
an error.
Change-Id: I9b984e40c523240bc08f5496183dec763cfef963
Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/main.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 249cb66ea0d5..fb017f0cf6ec 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1020,8 +1020,16 @@ static int dpm_suspend_late(pm_message_t state) int dpm_suspend_end(pm_message_t state) { int error = dpm_suspend_late(state); + if (error) + return error; - return error ? : dpm_suspend_noirq(state); + error = dpm_suspend_noirq(state); + if (error) { + dpm_resume_early(state); + return error; + } + + return 0; } EXPORT_SYMBOL_GPL(dpm_suspend_end); |