diff options
| author | Len Brown | 2006-12-16 07:01:18 +0100 |
|---|---|---|
| committer | Len Brown | 2006-12-16 07:01:18 +0100 |
| commit | cfee47f99bc14a6d7c6b0be2284db2cef310a815 (patch) | |
| tree | 2974594b06534c199ea9c4b39492d5a708bb539a /kernel/power/disk.c | |
| parent | ACPI: fix git automerge failure (diff) | |
| parent | ACPI: S4: Use "platform" rather than "shutdown" mode by default (diff) | |
| download | kernel-qcow2-linux-cfee47f99bc14a6d7c6b0be2284db2cef310a815.tar.gz kernel-qcow2-linux-cfee47f99bc14a6d7c6b0be2284db2cef310a815.tar.xz kernel-qcow2-linux-cfee47f99bc14a6d7c6b0be2284db2cef310a815.zip | |
Pull bugfix into test branch
Conflicts:
kernel/power/disk.c
Diffstat (limited to 'kernel/power/disk.c')
| -rw-r--r-- | kernel/power/disk.c | 8 |
1 files changed, 5 insertions, 3 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; |