diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-03 01:21:03 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-03 01:21:03 +0200 |
| commit | 62109b43176b87e78b2b6d91bcfe16128c30229b (patch) | |
| tree | 1b308b37ad78c2a8edd31934bc99f74066fa6430 /kernel/power/suspend.c | |
| parent | 69e273c0b0a3c337a521d083374c918dc52c666f (diff) | |
| download | op-kernel-dev-62109b43176b87e78b2b6d91bcfe16128c30229b.zip op-kernel-dev-62109b43176b87e78b2b6d91bcfe16128c30229b.tar.gz | |
PM / sleep: Fix test_suspend= command line option
After commit d431cbc53cb7 (PM / sleep: Simplify sleep states sysfs
interface code) the pm_states[] array is not populated initially,
which causes setup_test_suspend() to always fail and the suspend
testing during boot doesn't work any more.
Fix the problem by using pm_labels[] instead of pm_states[] in
setup_test_suspend() and storing a pointer to the label of the
sleep state to test rather than the number representing it,
because the connection between the state numbers and labels is
only established by suspend_set_ops().
Fixes: d431cbc53cb7 (PM / sleep: Simplify sleep states sysfs interface code)
Reported-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'kernel/power/suspend.c')
| -rw-r--r-- | kernel/power/suspend.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 6dadb25..18c6219 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -31,7 +31,7 @@ #include "power.h" -static const char *pm_labels[] = { "mem", "standby", "freeze", }; +const char *pm_labels[] = { "mem", "standby", "freeze", NULL }; const char *pm_states[PM_SUSPEND_MAX]; static const struct platform_suspend_ops *suspend_ops; |
