openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'pm-sleep' 

* pm-sleep:
  PM / Sleep: call early resume handlers when suspend_noirq fails
This commit is contained in:
Rafael J. Wysocki 2012-07-19 10:39:21 +02:00
parent bd798b7a88 064b021fbe
commit 382e159619
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/base/power/main.c
View File

@ -991,8 +991,16 @@ static int dpm_suspend_late(pm_message_t state)
int dpm_suspend_end(pm_message_t state) int dpm_suspend_end(pm_message_t state)
{ {
int error = dpm_suspend_late(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); EXPORT_SYMBOL_GPL(dpm_suspend_end);