2 files changed, 15 insertions, 6 deletions

diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index 13c93a13785e..fd1c4ba63367 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -229,10 +229,6 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state)
                                 "While executing method _SST"));
         }
 
-        /* Disable/Clear all GPEs */
-
-        status = acpi_hw_disable_all_gpes();
-
         return_ACPI_STATUS(status);
 }
 
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index fdd8139b3f98..198ff8a1529a 100644
--- 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)