Re: [PATCH] swsusp: Use platform mode by default

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Qi Yong
Date: Tuesday, October 16, 2007 - 8:44 pm

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);


-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Re: [PATCH] swsusp: Use platform mode by default, Coywolf Qi Hunt, (Fri May 11, 1:36 am)
Re: [PATCH] swsusp: Use platform mode by default, Rafael J. Wysocki, (Fri May 11, 2:21 am)
Re: [PATCH] swsusp: Use platform mode by default, Linus Torvalds, (Fri May 11, 9:30 am)
Re: [PATCH] swsusp: Use platform mode by default, Rafael J. Wysocki, (Fri May 11, 1:08 pm)
Re: [PATCH] swsusp: Use platform mode by default, Linus Torvalds, (Fri May 11, 3:51 pm)
Re: [PATCH] swsusp: Use platform mode by default, Pavel Machek, (Fri May 11, 4:23 pm)
Re: [PATCH] swsusp: Use platform mode by default, Len Brown, (Fri May 11, 8:50 pm)
Re: [PATCH] swsusp: Use platform mode by default, Bill Davidsen, (Sun May 13, 5:36 pm)
Re: [PATCH] swsusp: Use platform mode by default, Stefan Seyfried, (Mon May 14, 12:50 am)
Re: [PATCH] swsusp: Use platform mode by default, Qi Yong, (Tue Oct 16, 7:35 pm)
Re: [PATCH] swsusp: Use platform mode by default, Linus Torvalds, (Tue Oct 16, 7:46 pm)
Re: [PATCH] swsusp: Use platform mode by default, Qi Yong, (Tue Oct 16, 7:46 pm)
Re: [PATCH] swsusp: Use platform mode by default, Qi Yong, (Tue Oct 16, 8:44 pm)
Re: [PATCH] swsusp: Use platform mode by default, Rafael J. Wysocki, (Wed Oct 17, 10:32 am)