diff options
| author | Jason Jin <Jason.Jin@freescale.com> | 2015-03-19 05:40:14 (GMT) |
|---|---|---|
| committer | Jason Jin <Jason.Jin@freescale.com> | 2015-03-19 05:40:14 (GMT) |
| commit | b2d58e506b33b18574807e63007e87ebca0f9c07 (patch) | |
| tree | fc2afd772ba5cdac0dd091f65c492695b27d9a17 /kernel/power/hibernate.c | |
| parent | 2bbe09ef71ce8446ba0b3e29df2099150e9e6fdf (diff) | |
| parent | eb985cb9b5e02d470870617b41fa51a1d9360c7f (diff) | |
| download | linux-fsl-qoriq-b2d58e506b33b18574807e63007e87ebca0f9c07.tar.xz | |
Merge branch 'qoriq-sdk' into LS1-SDK
Diffstat (limited to 'kernel/power/hibernate.c')
| -rw-r--r-- | kernel/power/hibernate.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index d26958b..9c312ed 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -496,8 +496,14 @@ int hibernation_restore(int platform_mode) error = dpm_suspend_start(PMSG_QUIESCE); if (!error) { error = resume_target_kernel(platform_mode); - dpm_resume_end(PMSG_RECOVER); + /* + * The above should either succeed and jump to the new kernel, + * or return with an error. Otherwise things are just + * undefined, so let's be paranoid. + */ + BUG_ON(!error); } + dpm_resume_end(PMSG_RECOVER); pm_restore_gfp_mask(); ftrace_start(); resume_console(); |