Skip to content

Commit f1ab870

Browse files
rafaeljwgregkh
authored andcommitted
ACPI: EC: PM: Flush EC work unconditionally after wakeup
commit 5e92442 upstream. Commit 607b9df ("ACPI: EC: PM: Avoid flushing EC work when EC GPE is inactive") has been reported to cause some power button wakeup events to be missed on some systems, so modify acpi_ec_dispatch_gpe() to call acpi_ec_flush_work() unconditionally to effectively reverse the changes made by that commit. Also note that the problem which prompted commit 607b9df is not reproducible any more on the affected machine. Fixes: 607b9df ("ACPI: EC: PM: Avoid flushing EC work when EC GPE is inactive") Reported-by: Raymond Tan <raymond.tan@intel.com> Cc: 5.4+ <stable@vger.kernel.org> # 5.4+ Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent c56d455 commit f1ab870

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

drivers/acpi/ec.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2019,12 +2019,11 @@ bool acpi_ec_dispatch_gpe(void)
20192019
* to allow the caller to process events properly after that.
20202020
*/
20212021
ret = acpi_dispatch_gpe(NULL, first_ec->gpe);
2022-
if (ret == ACPI_INTERRUPT_HANDLED) {
2022+
if (ret == ACPI_INTERRUPT_HANDLED)
20232023
pm_pr_dbg("ACPI EC GPE dispatched\n");
20242024

2025-
/* Flush the event and query workqueues. */
2026-
acpi_ec_flush_work();
2027-
}
2025+
/* Flush the event and query workqueues. */
2026+
acpi_ec_flush_work();
20282027

20292028
return false;
20302029
}

0 commit comments

Comments
 (0)