diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-04 14:48:11 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-04 14:48:11 -1000 |
| commit | b512f71221d0bcb07ab32f3e958a84e164c85881 (patch) | |
| tree | 746aab0819800f4a499e6b4b72d56d4522973990 /drivers/acpi | |
| parent | 9db6ce4ecefb03698cb2875c1a46b9513303a9bf (diff) | |
| parent | b59fb7ef5240c301ca8b5b70d4298c0f053bb0c3 (diff) | |
| download | blackbird-op-linux-b512f71221d0bcb07ab32f3e958a84e164c85881.tar.gz blackbird-op-linux-b512f71221d0bcb07ab32f3e958a84e164c85881.zip | |
Merge tag 'acpi-5.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki:
"Prevent stale GPE events from triggering spurious system wakeups from
suspend-to-idle (Furquan Shaikh)"
* tag 'acpi-5.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
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); } |
