aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/system.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2010-06-08 10:50:53 +0200
committerLen Brown <len.brown@intel.com>2010-06-12 00:45:28 -0400
commit9d3c752de65dbfa6e522f1d666deb0ac152ef367 (patch)
tree811f3ac51c9fd02c2bf39236cef068e1e44dba72 /drivers/acpi/system.c
parentce43ace02320a3fb9614ddb27edc3a8700d68b26 (diff)
downloadmrst-s0i3-test-9d3c752de65dbfa6e522f1d666deb0ac152ef367.tar.gz
mrst-s0i3-test-9d3c752de65dbfa6e522f1d666deb0ac152ef367.tar.xz
mrst-s0i3-test-9d3c752de65dbfa6e522f1d666deb0ac152ef367.zip
ACPI / ACPICA: Fix sysfs GPE interface
The sysfs interface allowing user space to disable/enable GPEs doesn't work correctly, because a GPE disabled this way will be re-enabled shortly by acpi_ev_asynch_enable_gpe() if it was previosuly enabled by acpi_enable_gpe() (in which case the corresponding bit in its enable register's enable_for_run mask is set). To address this issue make the sysfs GPE interface use acpi_enable_gpe() and acpi_disable_gpe() instead of acpi_set_gpe() so that GPE reference counters are modified by it along with the values of GPE enable registers. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Len Brown <len.brown@intel.com>
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 e35525b39f6..904e8fce2e7 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);