mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-02-13 16:33:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'pm-6.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Browse Source 
Pull power management fix from Rafael Wysocki:
 "Fix a recent regression that affects system suspend testing
  at the 'core' level (Rafael Wysocki)"

* tag 'pm-6.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM: sleep: Fix suspend_test() at the TEST_CORE level
This commit is contained in:
Linus Torvalds
2026-01-02 12:35:29 -08:00
parent dec1ecf2c7 684d3b2670
commit bbbc721033
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/power/suspend.c
View File

@@ -349,9 +349,12 @@ static int suspend_test(int level)
if (pm_test_level == level) {
pr_info("suspend debug: Waiting for %d second(s).\n",
pm_test_delay);
for (i = 0; i < pm_test_delay && !pm_wakeup_pending(); i++)
msleep(1000);
for (i = 0; i < pm_test_delay && !pm_wakeup_pending(); i++) {
if (level > TEST_CORE)
msleep(1000);
else
mdelay(1000);
}
return 1;
}
#endif /* !CONFIG_PM_DEBUG */