From 91ae2161c9e9d53376e91650c1a8d8776d88ba32 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Tue, 8 Jun 2010 10:50:53 +0200 Subject: [PATCH] --- yaml --- r: 200391 b: refs/heads/master c: 9d3c752de65dbfa6e522f1d666deb0ac152ef367 h: refs/heads/master i: 200389: 054e1e0d8ba2fe69326e78aecbb3fb3e4be1c04f 200387: 3b0c8cea7826651bedb0a7f53cbb8b95870245c0 200383: 9a1891d33412eb8552a1f8223eca50d262d20806 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/system.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index baf3e43c98af..d06643ec3bca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce43ace02320a3fb9614ddb27edc3a8700d68b26 +refs/heads/master: 9d3c752de65dbfa6e522f1d666deb0ac152ef367 diff --git a/trunk/drivers/acpi/system.c b/trunk/drivers/acpi/system.c index e35525b39f6b..904e8fce2e74 100644 --- a/trunk/drivers/acpi/system.c +++ b/trunk/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);