Merge tag 'pm-5.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
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
This commit is contained in:
@@ -131,11 +131,12 @@ static void s2idle_loop(void)
|
||||
* to avoid them upfront.
|
||||
*/
|
||||
for (;;) {
|
||||
if (s2idle_ops && s2idle_ops->wake)
|
||||
s2idle_ops->wake();
|
||||
|
||||
if (pm_wakeup_pending())
|
||||
if (s2idle_ops && s2idle_ops->wake) {
|
||||
if (s2idle_ops->wake())
|
||||
break;
|
||||
} else if (pm_wakeup_pending()) {
|
||||
break;
|
||||
}
|
||||
|
||||
pm_wakeup_clear(false);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user