ACPI: PM: s2idle: Avoid rearming SCI for wakeup unnecessarily
diff mbox series

Message ID 4168022.LLJTMZb2K0@kreacher
State Mainlined, archived
Headers show
Series
  • ACPI: PM: s2idle: Avoid rearming SCI for wakeup unnecessarily
Related show

Commit Message

Rafael J. Wysocki Aug. 19, 2019, 10:35 a.m. UTC
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Subject: [PATCH] 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 <rafael.j.wysocki@intel.com>
---

This patch is on top of the pm-s2idle-rework branch in the linux-pm.git tree that
has been present in linux-next for some time.

---
 drivers/acpi/sleep.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch
diff mbox series

Index: linux-pm/drivers/acpi/sleep.c
===================================================================
--- linux-pm.orig/drivers/acpi/sleep.c
+++ linux-pm/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)