diff options
| author | Len Brown <len.brown@intel.com> | 2008-11-11 21:17:26 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-11-11 21:17:26 -0500 |
| commit | d1876ba4dead6ace7e9fbf16f83397e6486d0dfe (patch) | |
| tree | ecf9a5b65c51ec3c8fd19a1ebe9cf70aac949aaa /drivers/acpi/system.c | |
| parent | 547f7847472c097a54adf38e6576f95ab512e27c (diff) | |
| parent | 8517934ef6aaa28d6e055b98df65b31cedbd1372 (diff) | |
Merge branch 'ec' into release
Diffstat (limited to 'drivers/acpi/system.c')
| -rw-r--r-- | drivers/acpi/system.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c index bfc216a11fd..6e4107f8240 100644 --- a/drivers/acpi/system.c +++ b/drivers/acpi/system.c | |||
| @@ -398,10 +398,10 @@ static ssize_t counter_set(struct kobject *kobj, | |||
| 398 | if (index < num_gpes) { | 398 | if (index < num_gpes) { |
| 399 | if (!strcmp(buf, "disable\n") && | 399 | if (!strcmp(buf, "disable\n") && |
| 400 | (status & ACPI_EVENT_FLAG_ENABLED)) | 400 | (status & ACPI_EVENT_FLAG_ENABLED)) |
| 401 | result = acpi_disable_gpe(handle, index, ACPI_NOT_ISR); | 401 | result = acpi_disable_gpe(handle, index); |
| 402 | else if (!strcmp(buf, "enable\n") && | 402 | else if (!strcmp(buf, "enable\n") && |
| 403 | !(status & ACPI_EVENT_FLAG_ENABLED)) | 403 | !(status & ACPI_EVENT_FLAG_ENABLED)) |
| 404 | result = acpi_enable_gpe(handle, index, ACPI_NOT_ISR); | 404 | result = acpi_enable_gpe(handle, index); |
| 405 | else if (!strcmp(buf, "clear\n") && | 405 | else if (!strcmp(buf, "clear\n") && |
| 406 | (status & ACPI_EVENT_FLAG_SET)) | 406 | (status & ACPI_EVENT_FLAG_SET)) |
| 407 | result = acpi_clear_gpe(handle, index, ACPI_NOT_ISR); | 407 | result = acpi_clear_gpe(handle, index, ACPI_NOT_ISR); |