diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-01 13:03:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-01 13:03:39 -0700 |
| commit | fb0af61d3afe0b8f8b7bd2ed7c9fcaae670ced4a (patch) | |
| tree | d551672a3ce7ab92850d35fdf1a79cc35348b02e | |
| parent | 7e74e235bb31a1fefc28d5303da0718b88627ea8 (diff) | |
| parent | 2c2a2fb1e2a9256714338875bede6b7cbd4b9542 (diff) | |
| download | linux-fb0af61d3afe0b8f8b7bd2ed7c9fcaae670ced4a.tar.gz | |
Merge tag 'acpi-5.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki: "Revert a recent ACPICA change that caused initialization to fail on systems with Thunderbolt docking stations connected at the init time" * tag 'acpi-5.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: Revert "ACPICA: Clear status of GPEs before enabling them"
| -rw-r--r-- | drivers/acpi/acpica/evgpe.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c index 5e9d7348c16f..62d3aa74277b 100644 --- a/drivers/acpi/acpica/evgpe.c +++ b/drivers/acpi/acpica/evgpe.c @@ -81,12 +81,8 @@ acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info) ACPI_FUNCTION_TRACE(ev_enable_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); } |