From bbe0d8c98eda714a148429b48b52dff4577ee543 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Wed, 1 Nov 2006 13:23:14 +0100
Subject: [PATCH] --- yaml --- r: 44992 b: refs/heads/master c:
 9185cfa92507d07ac787bc73d06c42222eec7239 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/power/disk.c | 8 +++++---
 trunk/kernel/power/main.c | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 12c49b937cd3..74a815600723 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b0dc866dd9b8d10a53cb3537385a51b7ee54b62
+refs/heads/master: 9185cfa92507d07ac787bc73d06c42222eec7239
diff --git a/trunk/kernel/power/disk.c b/trunk/kernel/power/disk.c
index d3a158a60312..ae6bbc903b7d 100644
--- a/trunk/kernel/power/disk.c
+++ b/trunk/kernel/power/disk.c
@@ -44,9 +44,11 @@ static void power_down(suspend_disk_method_t mode)
 
 	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;
diff --git a/trunk/kernel/power/main.c b/trunk/kernel/power/main.c
index 873228c71dab..1210961a5aa7 100644
--- a/trunk/kernel/power/main.c
+++ b/trunk/kernel/power/main.c
@@ -27,7 +27,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.