mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 15:47:36 +00:00
PM: Fix error code paths executed after failing syscore_suspend()
If syscore_suspend() fails in suspend_enter(), create_image() or resume_target_kernel(), it is necessary to call sysdev_resume(), because sysdev_suspend() has been called already and succeeded and we are going to abort the transition. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
a1b49cb7e2
commit
2ca6f62f59
2 changed files with 12 additions and 3 deletions
|
@ -273,8 +273,11 @@ static int create_image(int platform_mode)
|
||||||
local_irq_disable();
|
local_irq_disable();
|
||||||
|
|
||||||
error = sysdev_suspend(PMSG_FREEZE);
|
error = sysdev_suspend(PMSG_FREEZE);
|
||||||
if (!error)
|
if (!error) {
|
||||||
error = syscore_suspend();
|
error = syscore_suspend();
|
||||||
|
if (error)
|
||||||
|
sysdev_resume();
|
||||||
|
}
|
||||||
if (error) {
|
if (error) {
|
||||||
printk(KERN_ERR "PM: Some system devices failed to power down, "
|
printk(KERN_ERR "PM: Some system devices failed to power down, "
|
||||||
"aborting hibernation\n");
|
"aborting hibernation\n");
|
||||||
|
@ -407,8 +410,11 @@ static int resume_target_kernel(bool platform_mode)
|
||||||
local_irq_disable();
|
local_irq_disable();
|
||||||
|
|
||||||
error = sysdev_suspend(PMSG_QUIESCE);
|
error = sysdev_suspend(PMSG_QUIESCE);
|
||||||
if (!error)
|
if (!error) {
|
||||||
error = syscore_suspend();
|
error = syscore_suspend();
|
||||||
|
if (error)
|
||||||
|
sysdev_resume();
|
||||||
|
}
|
||||||
if (error)
|
if (error)
|
||||||
goto Enable_irqs;
|
goto Enable_irqs;
|
||||||
|
|
||||||
|
|
|
@ -164,8 +164,11 @@ static int suspend_enter(suspend_state_t state)
|
||||||
BUG_ON(!irqs_disabled());
|
BUG_ON(!irqs_disabled());
|
||||||
|
|
||||||
error = sysdev_suspend(PMSG_SUSPEND);
|
error = sysdev_suspend(PMSG_SUSPEND);
|
||||||
if (!error)
|
if (!error) {
|
||||||
error = syscore_suspend();
|
error = syscore_suspend();
|
||||||
|
if (error)
|
||||||
|
sysdev_resume();
|
||||||
|
}
|
||||||
if (!error) {
|
if (!error) {
|
||||||
if (!(suspend_test(TEST_CORE) || pm_wakeup_pending())) {
|
if (!(suspend_test(TEST_CORE) || pm_wakeup_pending())) {
|
||||||
error = suspend_ops->enter(state);
|
error = suspend_ops->enter(state);
|
||||||
|
|
Loading…
Reference in a new issue