1 files changed, 17 insertions, 15 deletions

diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c
index 48f70013b488..e4ba4dec86af 100644
--- a/drivers/acpi/acpica/evgpe.c
+++ b/drivers/acpi/acpica/evgpe.c
@@ -698,21 +698,6 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
         }
 
         /*
-         * If edge-triggered, clear the GPE status bit now. Note that
-         * level-triggered events are cleared after the GPE is serviced.
-         */
-        if ((gpe_event_info->flags & ACPI_GPE_XRUPT_TYPE_MASK) ==
-            ACPI_GPE_EDGE_TRIGGERED) {
-                status = acpi_hw_clear_gpe(gpe_event_info);
-                if (ACPI_FAILURE(status)) {
-                        ACPI_EXCEPTION((AE_INFO, status,
-                                        "Unable to clear GPE %02X",
-                                        gpe_number));
-                        return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
-                }
-        }
-
-        /*
          * Always disable the GPE so that it does not keep firing before
          * any asynchronous activity completes (either from the execution
          * of a GPE method or an asynchronous GPE handler.)
@@ -729,6 +714,23 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
         }
 
         /*
+         * If edge-triggered, clear the GPE status bit now. Note that
+         * level-triggered events are cleared after the GPE is serviced.
+         */
+        if ((gpe_event_info->flags & ACPI_GPE_XRUPT_TYPE_MASK) ==
+            ACPI_GPE_EDGE_TRIGGERED) {
+                status = acpi_hw_clear_gpe(gpe_event_info);
+                if (ACPI_FAILURE(status)) {
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "Unable to clear GPE %02X",
+                                        gpe_number));
+                        (void)acpi_hw_low_set_gpe(gpe_event_info,
+                                                  ACPI_GPE_CONDITIONAL_ENABLE);
+                        return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
+                }
+        }
+
+        /*
          * Dispatch the GPE to either an installed handler or the control
          * method associated with this GPE (_Lxx or _Exx). If a handler
          * exists, we invoke it and do not attempt to run the method.