diff options
Diffstat (limited to 'drivers/acpi/system.c')
-rw-r--r-- | drivers/acpi/system.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c index 4aaf24976138..e35525b39f6b 100644 --- a/drivers/acpi/system.c +++ b/drivers/acpi/system.c | |||
@@ -303,8 +303,7 @@ static int get_status(u32 index, acpi_event_status *status, acpi_handle *handle) | |||
303 | "Invalid GPE 0x%x\n", index)); | 303 | "Invalid GPE 0x%x\n", index)); |
304 | goto end; | 304 | goto end; |
305 | } | 305 | } |
306 | result = acpi_get_gpe_status(*handle, index, | 306 | result = acpi_get_gpe_status(*handle, index, status); |
307 | ACPI_NOT_ISR, status); | ||
308 | } else if (index < (num_gpes + ACPI_NUM_FIXED_EVENTS)) | 307 | } else if (index < (num_gpes + ACPI_NUM_FIXED_EVENTS)) |
309 | result = acpi_get_event_status(index - num_gpes, status); | 308 | result = acpi_get_event_status(index - num_gpes, status); |
310 | 309 | ||
@@ -395,7 +394,7 @@ static ssize_t counter_set(struct kobject *kobj, | |||
395 | result = acpi_set_gpe(handle, index, ACPI_GPE_ENABLE); | 394 | result = acpi_set_gpe(handle, index, ACPI_GPE_ENABLE); |
396 | else if (!strcmp(buf, "clear\n") && | 395 | else if (!strcmp(buf, "clear\n") && |
397 | (status & ACPI_EVENT_FLAG_SET)) | 396 | (status & ACPI_EVENT_FLAG_SET)) |
398 | result = acpi_clear_gpe(handle, index, ACPI_NOT_ISR); | 397 | result = acpi_clear_gpe(handle, index); |
399 | else | 398 | else |
400 | all_counters[index].count = strtoul(buf, NULL, 0); | 399 | all_counters[index].count = strtoul(buf, NULL, 0); |
401 | } else if (index < num_gpes + ACPI_NUM_FIXED_EVENTS) { | 400 | } else if (index < num_gpes + ACPI_NUM_FIXED_EVENTS) { |