Pull power management fixes from Rafael Wysocki: "Fix three issues related to the handling of wakeup events signaled through the ACPI SCI while suspended to idle (Rafael Wysocki) and unexport an internal cpufreq variable (Yangtao Li)" * tag 'pm-5.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI: PM: s2idle: Prevent spurious SCIs from waking up the system ACPICA: Introduce acpi_any_gpe_status_set() ACPI: PM: s2idle: Avoid possible race related to the EC GPE ACPI: EC: Fix flushing of pending work cpufreq: Make cpufreq_global_kobject static
Showing the changes to kernel (1 of 10 files). Show all
Unified · Split
| @@ -131,11 +131,12 @@ static void s2idle_loop(void) · 130 unmodified lines | ||
| 131 | 131 | * to avoid them upfront. |
| 132 | 132 | */ |
| 133 | 133 | for (;;) { |
| 134 | − if (s2idle_ops && s2idle_ops->wake) | |
| 135 | − s2idle_ops->wake(); | |
| 136 | − | |
| 137 | − if (pm_wakeup_pending()) | |
| 134 | + if (s2idle_ops && s2idle_ops->wake) { | |
| 135 | + if (s2idle_ops->wake()) | |
| 136 | + break; | |
| 137 | + } else if (pm_wakeup_pending()) { | |
| 138 | 138 | break; |
| 139 | + } | |
| 139 | 140 | |
| 140 | 141 | pm_wakeup_clear(false); |
| 141 | 142 | |