diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-04-04 22:08:47 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-04-04 22:08:47 +0200 |
| commit | b59fb7ef5240c301ca8b5b70d4298c0f053bb0c3 (patch) | |
| tree | c8e08b455faf8801e31fa030e18c23df50b1bfd3 /drivers/acpi | |
| parent | aa9aaa4d61c0048d3faad056893cd7860bbc084c (diff) | |
| parent | c8b1917c8987a6fa3695d479b4d60fbbbc3e537b (diff) | |
| download | linux-b59fb7ef5240c301ca8b5b70d4298c0f053bb0c3.tar.bz2 | |
Merge branch 'acpica' into acpi
* acpica:
ACPICA: Clear status of GPEs before enabling them
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/acpica/evgpe.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c index 62d3aa74277b..5e9d7348c16f 100644 --- a/drivers/acpi/acpica/evgpe.c +++ b/drivers/acpi/acpica/evgpe.c @@ -81,8 +81,12 @@ acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info) ACPI_FUNCTION_TRACE(ev_enable_gpe); - /* Enable the requested GPE */ + /* Clear the GPE status */ + status = acpi_hw_clear_gpe(gpe_event_info); + if (ACPI_FAILURE(status)) + return_ACPI_STATUS(status); + /* Enable the requested GPE */ status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_ENABLE); return_ACPI_STATUS(status); } |