summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/system.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-11-11 21:17:26 -0500
committerLen Brown <len.brown@intel.com>2008-11-11 21:17:26 -0500
commitd1876ba4dead6ace7e9fbf16f83397e6486d0dfe (patch)
treeecf9a5b65c51ec3c8fd19a1ebe9cf70aac949aaa /drivers/acpi/system.c
parent547f7847472c097a54adf38e6576f95ab512e27c (diff)
parent8517934ef6aaa28d6e055b98df65b31cedbd1372 (diff)
downloadop-kernel-dev-d1876ba4dead6ace7e9fbf16f83397e6486d0dfe.zip
op-kernel-dev-d1876ba4dead6ace7e9fbf16f83397e6486d0dfe.tar.gz
Merge branch 'ec' into release
Diffstat (limited to 'drivers/acpi/system.c')
-rw-r--r--drivers/acpi/system.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c
index bfc216a..6e4107f 100644
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@ -398,10 +398,10 @@ static ssize_t counter_set(struct kobject *kobj,
if (index < num_gpes) {
if (!strcmp(buf, "disable\n") &&
(status & ACPI_EVENT_FLAG_ENABLED))
- result = acpi_disable_gpe(handle, index, ACPI_NOT_ISR);
+ result = acpi_disable_gpe(handle, index);
else if (!strcmp(buf, "enable\n") &&
!(status & ACPI_EVENT_FLAG_ENABLED))
- result = acpi_enable_gpe(handle, index, ACPI_NOT_ISR);
+ result = acpi_enable_gpe(handle, index);
else if (!strcmp(buf, "clear\n") &&
(status & ACPI_EVENT_FLAG_SET))
result = acpi_clear_gpe(handle, index, ACPI_NOT_ISR);
OpenPOWER on IntegriCloud