---

yaml --- r: 44992 b: refs/heads/master c: 9185cfa h: refs/heads/master v: v3
git-mirror · Nov 2, 2006 · bbe0d8c · bbe0d8c
1 parent ae18399
commit bbe0d8c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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.