From 313ba573f1553e0128d7765f6b8cf919862db0bb Mon Sep 17 00:00:00 2001 From: Patrick Mochel Date: Tue, 19 Aug 2003 02:39:55 -0700 Subject: [PATCH] [acpi] Always handle requests for entering S4, not just for S4bios. --- drivers/acpi/sleep/main.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index 5011051e6a94b..d3f29ce924aee 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c @@ -18,6 +18,8 @@ u8 sleep_states[ACPI_S_STATE_COUNT]; +static struct pm_ops acpi_pm_ops; + extern void do_suspend_lowlevel_s4bios(int); extern void do_suspend_lowlevel(int); @@ -85,6 +87,7 @@ static int acpi_pm_enter(u32 state) { acpi_status status = AE_OK; unsigned long flags = 0; + u32 acpi_state = acpi_suspend_states[state]; ACPI_FLUSH_CPU_CACHE(); local_irq_save(flags); @@ -92,7 +95,7 @@ static int acpi_pm_enter(u32 state) { case PM_SUSPEND_STANDBY: barrier(); - status = acpi_enter_sleep_state(acpi_suspend_states[state]); + status = acpi_enter_sleep_state(acpi_state); break; case PM_SUSPEND_MEM: @@ -100,7 +103,10 @@ static int acpi_pm_enter(u32 state) break; case PM_SUSPEND_DISK: - do_suspend_lowlevel_s4bios(0); + if (acpi_pm_ops.pm_disk_mode == PM_DISK_PLATFORM) + status = acpi_enter_sleep_state(acpi_state); + else + do_suspend_lowlevel_s4bios(0); break; default: return -EINVAL; -- 2.53.0