ACPI: Separate disabling of GPEs from _PTS

[linux-2.6-omap-h63xx.git] / drivers / acpi / sleep / main.c

diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index fdd8139b3f98926ce8f37061ae9e515e585dbbc7..198ff8a1529a1b7e0a5689c2d73f23570f241cb1 100644 (file)
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -91,10 +91,13 @@ static int acpi_pm_begin(suspend_state_t pm_state)
 
 static int acpi_pm_prepare(void)
 {
-       int error = acpi_sleep_prepare(acpi_target_sleep_state);
+       int error;
 
+       error = acpi_sleep_prepare(acpi_target_sleep_state);
        if (error)
                acpi_target_sleep_state = ACPI_STATE_S0;
+       else if (!ACPI_SUCCESS(acpi_hw_disable_all_gpes()))
+               error = -EFAULT;
 
        return error;
 }
@@ -261,7 +264,16 @@ static int acpi_hibernation_start(void)
 
 static int acpi_hibernation_prepare(void)
 {
-       return acpi_sleep_prepare(ACPI_STATE_S4);
+       int error;
+
+       error = acpi_sleep_prepare(ACPI_STATE_S4);
+       if (error)
+               return error;
+
+       if (!ACPI_SUCCESS(acpi_hw_disable_all_gpes()))
+               error = -EFAULT;
+
+       return error;
 }
 
 static int acpi_hibernation_enter(void)
@@ -426,6 +438,7 @@ static void acpi_power_off_prepare(void)
 {
        /* Prepare to power off the system */
        acpi_sleep_prepare(ACPI_STATE_S5);
+       acpi_hw_disable_all_gpes();
 }
 
 static void acpi_power_off(void)