On Wed, Oct 17, 2007 at 10:46:12AM +0800, Qi Yong wrote:
please apply.
Signed-off-by: Qi Yong <qiyong@fc-cn.com>
---
diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index eb72255..95b66ee 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -61,9 +61,11 @@ void hibernation_set_ops(struct hibernation_ops *ops)
}
mutex_lock(&pm_mutex);
hibernation_ops = ops;
- if (ops)
- hibernation_mode = HIBERNATION_PLATFORM;
- else if (hibernation_mode == HIBERNATION_PLATFORM)
+
+ /*
+ * Turn off HIBERNATION_PLATFORM if we no longer have any platform ops.
+ */
+ if (!ops && hibernation_mode == HIBERNATION_PLATFORM)
hibernation_mode = HIBERNATION_SHUTDOWN;
mutex_unlock(&pm_mutex);
-