diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2017-02-17 14:18:44 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-18 02:16:27 +0100 |
| commit | 8cff66791a6bfc8fb98f93e4e7c13fd06afecf7a (patch) | |
| tree | ea6f6398c46c1e2b106feaa858fdff94af8eb6db /kernel/power | |
| parent | Merge back earlier suspend/hibernation changes for v4.11. (diff) | |
| download | linux-8cff66791a6bfc8fb98f93e4e7c13fd06afecf7a.tar.xz linux-8cff66791a6bfc8fb98f93e4e7c13fd06afecf7a.zip | |
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 406e79385f3223d8 ("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: 406e79385f3223d8 (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>
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/suspend_test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/suspend_test.c b/kernel/power/suspend_test.c index bdff5ed57f10..5db217051232 100644 --- a/kernel/power/suspend_test.c +++ b/kernel/power/suspend_test.c @@ -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; |