aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-12-16 01:01:18 -0500
committerLen Brown <len.brown@intel.com>2006-12-16 01:01:18 -0500
commitcfee47f99bc14a6d7c6b0be2284db2cef310a815 (patch)
tree2974594b06534c199ea9c4b39492d5a708bb539a /kernel
parent7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c (diff)
parent9185cfa92507d07ac787bc73d06c42222eec7239 (diff)
Pull bugfix into test branch
Conflicts: kernel/power/disk.c
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/disk.c8
-rw-r--r--kernel/power/main.c2
2 files changed, 6 insertions, 4 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 0b00f56c2ad0..88fc5d7ac737 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -60,9 +60,11 @@ static void power_down(suspend_disk_method_t mode)
60{ 60{
61 switch(mode) { 61 switch(mode) {
62 case PM_DISK_PLATFORM: 62 case PM_DISK_PLATFORM:
63 kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK); 63 if (pm_ops && pm_ops->enter) {
64 pm_ops->enter(PM_SUSPEND_DISK); 64 kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
65 break; 65 pm_ops->enter(PM_SUSPEND_DISK);
66 break;
67 }
66 case PM_DISK_SHUTDOWN: 68 case PM_DISK_SHUTDOWN:
67 kernel_power_off(); 69 kernel_power_off();
68 break; 70 break;
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 500eb87f643d..ff3a6182f5f0 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -29,7 +29,7 @@
29DEFINE_MUTEX(pm_mutex); 29DEFINE_MUTEX(pm_mutex);
30 30
31struct pm_ops *pm_ops; 31struct pm_ops *pm_ops;
32suspend_disk_method_t pm_disk_mode = PM_DISK_SHUTDOWN; 32suspend_disk_method_t pm_disk_mode = PM_DISK_PLATFORM;
33 33
34/** 34/**
35 * pm_set_ops - Set the global power method table. 35 * pm_set_ops - Set the global power method table.