diff options
author | Frans Pop <elendil@planet.nl> | 2007-09-20 22:27:44 +0200 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-09-21 21:53:18 -0400 |
commit | 5a50fe709d527f31169263e36601dd83446d5744 (patch) | |
tree | c2b7cc75303b10b01151e142ab850691ec476440 | |
parent | f216cc3748a3a22c2b99390fddcdafa0583791a2 (diff) | |
download | talos-obmc-linux-5a50fe709d527f31169263e36601dd83446d5744.tar.gz talos-obmc-linux-5a50fe709d527f31169263e36601dd83446d5744.zip |
ACPI: suspend: consolidate handling of Sx states addendum
Make the S0 state be always reported as supported
Signed-off: Frans Pop <elendil@planet.nl>
Acked-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r-- | drivers/acpi/sleep/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index 638172fe6825..85633c585aab 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c @@ -401,9 +401,11 @@ int __init acpi_sleep_init(void) if (acpi_disabled) return 0; -printk(KERN_INFO PREFIX "(supports"); + sleep_states[ACPI_STATE_S0] = 1; + printk(KERN_INFO PREFIX "(supports S0"); + #ifdef CONFIG_SUSPEND - for (i = ACPI_STATE_S0; i < ACPI_STATE_S4; i++) { + for (i = ACPI_STATE_S1; i < ACPI_STATE_S4; i++) { status = acpi_get_sleep_type_data(i, &type_a, &type_b); if (ACPI_SUCCESS(status)) { sleep_states[i] = 1; |