commit cfee47f99bc14a6d7c6b0be2284db2cef310a815
author Len Brown <len.brown@intel.com> Sat Dec 16 01:01:18 2006 -0500
committer Len Brown <len.brown@intel.com> Sat Dec 16 01:01:18 2006 -0500
tree 2974594b06534c199ea9c4b39492d5a708bb539a
parent 7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c
parent 9185cfa92507d07ac787bc73d06c42222eec7239

Pull bugfix into test branch

Conflicts:

	kernel/power/disk.c

kernel/power/disk.c

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 0b00f56..88fc5d7 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -60,9 +60,11 @@
 {
 	switch(mode) {
 	case PM_DISK_PLATFORM:
-		kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
-		pm_ops->enter(PM_SUSPEND_DISK);
-		break;
+		if (pm_ops && pm_ops->enter) {
+			kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
+			pm_ops->enter(PM_SUSPEND_DISK);
+			break;
+		}
 	case PM_DISK_SHUTDOWN:
 		kernel_power_off();
 		break;

kernel/power/main.c

diff --git a/kernel/power/main.c b/kernel/power/main.c
index 500eb87..ff3a618 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -29,7 +29,7 @@
 DEFINE_MUTEX(pm_mutex);
 
 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.