linux-acpi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] swsusp: Use platform mode by default
@ 2006-11-01 12:23 Rafael J. Wysocki
  2006-11-01 12:45 ` Stefan Seyfried
                   ` (2 more replies)
  0 siblings, 3 replies; 18+ messages in thread
From: Rafael J. Wysocki @ 2006-11-01 12:23 UTC (permalink / raw)
  To: Andrew Morton
  Cc: Alexey Starikovskiy, LKML, Pavel Machek, linux-acpi,
	Stefan Seyfried

It has been reported that on some systems the functionality after a resume
from disk is limited if the system is simply powered off during the suspend
instead of using the ACPI S4 suspend (aka platform mode).

Unfortunately the default is currently to power off the system during the
suspend so the users of these systems experience problems after the resume
if they don't switch to the platform mode explicitly.  This patch makes swsusp
use the platform mode by default to avoid such situations.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 kernel/power/disk.c |    8 +++++---
 kernel/power/main.c |    2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

Index: linux-2.6.19-rc4-mm1/kernel/power/main.c
===================================================================
--- linux-2.6.19-rc4-mm1.orig/kernel/power/main.c
+++ linux-2.6.19-rc4-mm1/kernel/power/main.c
@@ -29,7 +29,7 @@
 DECLARE_MUTEX(pm_sem);
 
 struct pm_ops *pm_ops;
-suspend_disk_method_t pm_disk_mode = PM_DISK_SHUTDOWN;
+suspend_disk_method_t pm_disk_mode = PM_DISK_PLATFORM;
 
 /**
  *	pm_set_ops - Set the global power method table. 
Index: linux-2.6.19-rc4-mm1/kernel/power/disk.c
===================================================================
--- linux-2.6.19-rc4-mm1.orig/kernel/power/disk.c
+++ linux-2.6.19-rc4-mm1/kernel/power/disk.c
@@ -62,9 +62,11 @@ static void power_down(suspend_disk_meth
 
 	switch(mode) {
 	case PM_DISK_PLATFORM:
-		kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
-		error = pm_ops->enter(PM_SUSPEND_DISK);
-		break;
+		if (pm_ops && pm_ops->enter) {
+			kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
+			error = pm_ops->enter(PM_SUSPEND_DISK);
+			break;
+		}
 	case PM_DISK_SHUTDOWN:
 		kernel_power_off();
 		break;

^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2007-10-17 17:16 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-01 12:23 [PATCH] swsusp: Use platform mode by default Rafael J. Wysocki
2006-11-01 12:45 ` Stefan Seyfried
2006-11-01 13:21 ` Pavel Machek
2006-11-02  3:40 ` Len Brown
2007-05-11  8:36   ` Coywolf Qi Hunt
2007-05-11  9:21     ` Rafael J. Wysocki
2007-05-11 16:30       ` Linus Torvalds
2007-05-11 20:08         ` Rafael J. Wysocki
2007-05-11 22:51           ` Linus Torvalds
2007-05-11 23:23             ` Pavel Machek
2007-05-12  3:50               ` Len Brown
2007-05-14  7:50             ` Stefan Seyfried
2007-10-17  2:35               ` Qi Yong
2007-10-17  2:46                 ` Linus Torvalds
2007-05-14  0:36           ` Bill Davidsen
2007-10-17  2:46         ` Qi Yong
2007-10-17  3:44           ` Qi Yong
2007-10-17 17:32             ` Rafael J. Wysocki

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).