diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-01-02 12:35:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-01-02 12:35:29 -0800 |
| commit | bbbc721033c076bad736c48a2b9f75bee4003607 (patch) | |
| tree | 0aa9ab427eed3456d92630930635f3da6f9bf365 /kernel | |
| parent | dec1ecf2c707ff34aa3224fd49aeee0a852a62f7 (diff) | |
| parent | 684d3b2670a26313bbb99de6d66f384ac0e31c9b (diff) | |
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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/suspend.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 2da4482bb6eb..57c44268698f 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -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 */ |