Skip to content

Commit bbbc721

Browse files
committed
Merge tag 'pm-6.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
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
2 parents dec1ecf + 684d3b2 commit bbbc721

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

kernel/power/suspend.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,9 +349,12 @@ static int suspend_test(int level)
349349
if (pm_test_level == level) {
350350
pr_info("suspend debug: Waiting for %d second(s).\n",
351351
pm_test_delay);
352-
for (i = 0; i < pm_test_delay && !pm_wakeup_pending(); i++)
353-
msleep(1000);
354-
352+
for (i = 0; i < pm_test_delay && !pm_wakeup_pending(); i++) {
353+
if (level > TEST_CORE)
354+
msleep(1000);
355+
else
356+
mdelay(1000);
357+
}
355358
return 1;
356359
}
357360
#endif /* !CONFIG_PM_DEBUG */

0 commit comments

Comments
 (0)