redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

PM / sleep: Fix test_suspend after sleep state rework 

When passing "test_suspend=mem" to the kernel:

    PM: can't test 'mem' suspend state

and the suspend test is not run.

Commit 406e79385f ("PM / sleep: System sleep state selection
interface rework") changed pm_labels[] from a contiguous NULL-terminated
array to a sparse array (with the first element unpopulated), breaking
the assumptions of the iterator in setup_test_suspend().

Iterate from PM_SUSPEND_MIN to PM_SUSPEND_MAX - 1 to fix this.

Fixes: 406e79385f (PM / sleep: System sleep state selection interface rework)
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
hifive-unleashed-5.1
Geert Uytterhoeven 2017-02-17 14:18:44 +01:00 committed by Rafael J. Wysocki
parent 858a0d7eb5
commit 8cff66791a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/power/suspend_test.c
View File

@ -166,7 +166,7 @@ static int __init setup_test_suspend(char *value)
return 0;
}
for (i = 0; pm_labels[i]; i++)
for (i = PM_SUSPEND_MIN; i < PM_SUSPEND_MAX; i++)
if (!strcmp(pm_labels[i], suspend_type)) {
test_state_label = pm_labels[i];
return 0;