From d8117a0bf9bb60f5a7a5a73db2cedc2d365bf462 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Sun, 26 Dec 2010 12:47:06 +0100
Subject: [PATCH] --- yaml --- r: 223658 b: refs/heads/master c:
 5acdb1af907d5908b4942d425c0983f353dd8fc5 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/acpi/acpica/evgpeinit.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0364d6539eb3..0001d9a4c17e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b581a7f9c3abc6c7afacd021747543d32ff17adb
+refs/heads/master: 5acdb1af907d5908b4942d425c0983f353dd8fc5
diff --git a/trunk/drivers/acpi/acpica/evgpeinit.c b/trunk/drivers/acpi/acpica/evgpeinit.c
index 2c7def95f721..4c8dea513b66 100644
--- a/trunk/drivers/acpi/acpica/evgpeinit.c
+++ b/trunk/drivers/acpi/acpica/evgpeinit.c
@@ -408,6 +408,9 @@ acpi_ev_match_gpe_method(acpi_handle obj_handle,
 		return_ACPI_STATUS(AE_OK);
 	}
 
+	/* Disable the GPE in case it's been enabled already. */
+	(void)acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_DISABLE);
+
 	/*
 	 * Add the GPE information from above to the gpe_event_info block for
 	 * use during dispatch of this GPE.