3 files changed, 7 insertions, 13 deletions

diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c
index 5ed064e8673c..ccf793247447 100644
--- a/drivers/acpi/acpica/evgpe.c
+++ b/drivers/acpi/acpica/evgpe.c
@@ -92,6 +92,7 @@ acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info)
                 ACPI_SET_BIT(gpe_register_info->enable_for_run,
                              (u8)register_bit);
         }
+        gpe_register_info->enable_mask = gpe_register_info->enable_for_run;
 
         return_ACPI_STATUS(AE_OK);
 }
@@ -123,7 +124,7 @@ acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
 
         /* Enable the requested GPE */
 
-        status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_ENABLE_SAVE);
+        status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_ENABLE);
         return_ACPI_STATUS(status);
 }
 
@@ -202,7 +203,7 @@ acpi_ev_remove_gpe_reference(struct acpi_gpe_event_info *gpe_event_info)
                 if (ACPI_SUCCESS(status)) {
                         status =
                             acpi_hw_low_set_gpe(gpe_event_info,
-                                                ACPI_GPE_DISABLE_SAVE);
+                                                ACPI_GPE_DISABLE);
                 }
 
                 if (ACPI_FAILURE(status)) {
diff --git a/drivers/acpi/acpica/hwgpe.c b/drivers/acpi/acpica/hwgpe.c
index d7be3cbff151..73cfa5947ff3 100644
--- a/drivers/acpi/acpica/hwgpe.c
+++ b/drivers/acpi/acpica/hwgpe.c
@@ -89,6 +89,8 @@ u32 acpi_hw_get_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info)
  * RETURN:      Status
  *
  * DESCRIPTION: Enable or disable a single GPE in the parent enable register.
+ *              The enable_mask field of the involved GPE register must be
+ *              updated by the caller if necessary.
  *
  ******************************************************************************/
 
@@ -119,7 +121,7 @@ acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u32 action)
         /* Set or clear just the bit that corresponds to this GPE */
 
         register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info);
-        switch (action & ~ACPI_GPE_SAVE_MASK) {
+        switch (action) {
         case ACPI_GPE_CONDITIONAL_ENABLE:
 
                 /* Only enable if the corresponding enable_mask bit is set */
@@ -149,9 +151,6 @@ acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u32 action)
         /* Write the updated enable mask */
 
         status = acpi_hw_write(enable_mask, &gpe_register_info->enable_address);
-        if (ACPI_SUCCESS(status) && (action & ACPI_GPE_SAVE_MASK)) {
-                gpe_register_info->enable_mask = (u8)enable_mask;
-        }
         return (status);
 }
 
@@ -297,10 +296,8 @@ acpi_hw_gpe_enable_write(u8 enable_mask,
 {
         acpi_status status;
 
+        gpe_register_info->enable_mask = enable_mask;
         status = acpi_hw_write(enable_mask, &gpe_register_info->enable_address);
-        if (ACPI_SUCCESS(status)) {
-                gpe_register_info->enable_mask = enable_mask;
-        }
         return (status);
 }
 
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index ace520f3780e..f5ca0e989bba 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -759,10 +759,6 @@ typedef u32 acpi_event_status;
 #define ACPI_GPE_ENABLE                 0
 #define ACPI_GPE_DISABLE                1
 #define ACPI_GPE_CONDITIONAL_ENABLE     2
-#define ACPI_GPE_SAVE_MASK              4
-
-#define ACPI_GPE_ENABLE_SAVE            (ACPI_GPE_ENABLE | ACPI_GPE_SAVE_MASK)
-#define ACPI_GPE_DISABLE_SAVE           (ACPI_GPE_DISABLE | ACPI_GPE_SAVE_MASK)
 
 /*
  * GPE info flags - Per GPE