From: Rafael J. Wysocki <rjw@xxxxxxx>
During hibernation we call hibernation_ops->prepare() before creating the image,
but then we cancel the power transition by calling hibernation_ops->finish()
before saving it. Thus prior to calling hibernation_ops->enter() we should let
the platform firmware know that we're going to enter the low power state after
all.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
---
kernel/power/disk.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
Index: linux-2.6.22-rc2/kernel/power/disk.c
===================================================================
--- linux-2.6.22-rc2.orig/kernel/power/disk.c 2007-05-19 11:25:56.000000000 +0200
+++ linux-2.6.22-rc2/kernel/power/disk.c 2007-05-19 12:09:19.000000000 +0200
@@ -205,12 +205,24 @@ int hibernation_restore(int platform_mod
int hibernation_platform_enter(void)
{
+ int error;
+
if (hibernation_ops) {
- kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
- return hibernation_ops->enter();
+ /*
+ * We have cancelled the power transition by running
+ * hibernation_ops->finish() before saving the image, so we
+ * should let the firmware know that we're going to enter the
+ * sleep state after all
+ */
+ error = hibernation_ops->prepare();
+ if (!error) {
+ kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
+ error = hibernation_ops->enter();
+ }
} else {
- return -ENOSYS;
+ error = -ENOSYS;
}
+ return error;
}
/**
_______________________________________________
linux-pm mailing list
linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/linux-pm
