diff options
| author |   Len Brown <len.brown@intel.com> | 2010-08-15 00:25:40 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-08-15 00:25:40 -0400 |
| commit | c172cb73bc79fe69915b1a1a48e374aa4b1f8a59 (patch) | |
| tree | eb3d6415914968441c063f7282e824b14b5a5edb /drivers/acpi/system.c | |
| parent | Merge branch 'bugzilla-16422' into release (diff) | |
| parent | ACPI / ACPICA: Fix reference counting problems with GPE handlers (diff) | |
| download | linux-dev-c172cb73bc79fe69915b1a1a48e374aa4b1f8a59.tar.xz linux-dev-c172cb73bc79fe69915b1a1a48e374aa4b1f8a59.zip | |
Merge branch 'acpica-gpe' into release
Diffstat (limited to '')
| -rw-r--r-- | drivers/acpi/system.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c index f8db50a0941c..5981bd07e20e 100644 --- a/drivers/acpi/system.c +++ b/drivers/acpi/system.c @@ -388,12 +388,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_GPE_TYPE_RUNTIME); + result = acpi_disable_gpe(handle, index); else if (!strcmp(buf, "enable\n") && !(status & ACPI_EVENT_FLAG_ENABLED)) - result = acpi_enable_gpe(handle, index, - ACPI_GPE_TYPE_RUNTIME); + result = acpi_enable_gpe(handle, index); else if (!strcmp(buf, "clear\n") && (status & ACPI_EVENT_FLAG_SET)) result = acpi_clear_gpe(handle, index); |