From: Frans Pop <elendil@planet.nl>
Date: Thu, 20 Sep 2007 20:27:44 +0000 (+0200)
Subject: ACPI: suspend: consolidate handling of Sx states addendum
X-Git-Tag: v2.6.23-rc8~8^2^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5a50fe709d527f31169263e36601dd83446d5744;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 638172fe682..85633c585aa 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;