summary refs log tree commit diff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2010-12-26 12:47:06 +0100
committerLen Brown <len.brown@intel.com>2010-12-26 17:02:55 -0500
commit5acdb1af907d5908b4942d425c0983f353dd8fc5 (patch)
tree41a37586a26042a2a299a40ec7a18aea1eefec90
parentb581a7f9c3abc6c7afacd021747543d32ff17adb (diff)
downloadlinux-5acdb1af907d5908b4942d425c0983f353dd8fc5.tar.gz
ACPI / ACPICA: Disable GPEs during initialization
GPEs with corresponding _Lxx/_Exx control methods need to be disabled
during initialization in case they have been enabled by the BIOS, so
that they don't fire up until they are enabled by acpi_update_gpes().

References: https://bugzilla.kernel.org/show_bug.cgi?id=25412
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/acpi/acpica/evgpeinit.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/evgpeinit.c b/drivers/acpi/acpica/evgpeinit.c
index 2c7def95f721..4c8dea513b66 100644
--- a/drivers/acpi/acpica/evgpeinit.c
+++ b/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.