ACPI: PM: s2idle: Cancel wakeup before dispatching EC GPE
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 4 Feb 2022 17:31:02 +0000 (18:31 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 7 Feb 2022 20:02:31 +0000 (21:02 +0100)
commitdc0075ba7f387fe4c48a8c674b11ab6f374a6acc
tree06b0a17e4e3142781a9029fac0de4144becce423
parentd6ebb17ccc7b37872a32bc25b4a21f1e5af8c7e3
ACPI: PM: s2idle: Cancel wakeup before dispatching EC GPE

Commit 4a9af6cac050 ("ACPI: EC: Rework flushing of EC work while
suspended to idle") made acpi_ec_dispatch_gpe() check
pm_wakeup_pending(), but that is before canceling the SCI wakeup,
so pm_wakeup_pending() is always true.  This causes the loop in
acpi_ec_dispatch_gpe() to always terminate after one iteration which
may not be correct.

Address this issue by canceling the SCI wakeup earlier, from
acpi_ec_dispatch_gpe() itself.

Fixes: 4a9af6cac050 ("ACPI: EC: Rework flushing of EC work while suspended to idle")
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/ec.c
drivers/acpi/sleep.c