summaryrefslogtreecommitdiff
path: root/drivers/acpi/system.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-06-12 00:51:49 -0400
committerLen Brown <len.brown@intel.com>2010-06-12 00:51:49 -0400
commit92634825571d86417941855a8e3189c07aa3c706 (patch)
tree92d30f0714607684642487145ff27ca56b59b9e1 /drivers/acpi/system.c
parent7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff)
parent9d3c752de65dbfa6e522f1d666deb0ac152ef367 (diff)
Merge branch 'gpe-regression-fixes' into release
Diffstat (limited to 'drivers/acpi/system.c')
-rw-r--r--drivers/acpi/system.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c
index c79e789ed03a..f8db50a0941c 100644
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@ -388,10 +388,12 @@ static ssize_t counter_set(struct kobject *kobj,
if (index < num_gpes) {
if (!strcmp(buf, "disable\n") &&
(status & ACPI_EVENT_FLAG_ENABLED))
- result = acpi_set_gpe(handle, index, ACPI_GPE_DISABLE);
+ result = acpi_disable_gpe(handle, index,
+ ACPI_GPE_TYPE_RUNTIME);
else if (!strcmp(buf, "enable\n") &&
!(status & ACPI_EVENT_FLAG_ENABLED))
- result = acpi_set_gpe(handle, index, ACPI_GPE_ENABLE);
+ result = acpi_enable_gpe(handle, index,
+ ACPI_GPE_TYPE_RUNTIME);
else if (!strcmp(buf, "clear\n") &&
(status & ACPI_EVENT_FLAG_SET))
result = acpi_clear_gpe(handle, index);