From: Rafael J. Wysocki Date: Mon, 19 Aug 2019 10:35:03 +0000 (+0200) Subject: ACPI: PM: s2idle: Avoid rearming SCI for wakeup unnecessarily X-Git-Tag: v5.4-rc1~142^2~4^2^2~1 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=45dc1576e4575ba621cb6d017faf41531d8c1073;p=linux.git ACPI: PM: s2idle: Avoid rearming SCI for wakeup unnecessarily It is only necessary to rearm the ACPI SCI for wakeup if pm_system_cancel_wakeup() has been called, so invoke rearm_wake_irq() only in that case. Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 8f7e95f97e1f..c52ecbda863f 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -1012,9 +1012,9 @@ static void acpi_s2idle_wake(void) acpi_os_wait_events_complete(); /* synchronize EC GPE processing */ acpi_ec_flush_work(); acpi_os_wait_events_complete(); /* synchronize Notify handling */ - } - rearm_wake_irq(acpi_sci_irq); + rearm_wake_irq(acpi_sci_irq); + } } static void acpi_s2idle_restore_early(void)