projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PM / Sleep: fix recovery during resuming from hibernation
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
kernel
/
power
/
hibernate.c
diff --git
a/kernel/power/hibernate.c
b/kernel/power/hibernate.c
index
37170d4
..
126586a
100644
(file)
--- a/
kernel/power/hibernate.c
+++ b/
kernel/power/hibernate.c
@@
-492,8
+492,14
@@
int hibernation_restore(int platform_mode)
error = dpm_suspend_start(PMSG_QUIESCE);
if (!error) {
error = resume_target_kernel(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();
pm_restore_gfp_mask();
ftrace_start();
resume_console();