diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-16 01:01:18 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-16 01:01:18 -0500 |
| commit | cfee47f99bc14a6d7c6b0be2284db2cef310a815 (patch) | |
| tree | 2974594b06534c199ea9c4b39492d5a708bb539a /kernel | |
| parent | 7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c (diff) | |
| parent | 9185cfa92507d07ac787bc73d06c42222eec7239 (diff) | |
| download | linux-next-cfee47f99bc14a6d7c6b0be2284db2cef310a815.tar.gz | |
Pull bugfix into test branch
Conflicts:
kernel/power/disk.c
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/disk.c | 8 | ||||
| -rw-r--r-- | kernel/power/main.c | 2 |
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) { 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; 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 @@ 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. |