hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PM: suspend: fix return value of __setup handler 

If an invalid option is given for "test_suspend=<option>", the entire
string is added to init's environment, so return 1 instead of 0 from
the __setup handler.

  Unknown kernel command line parameters "BOOT_IMAGE=/boot/bzImage-517rc5
    test_suspend=invalid"

and

 Run /sbin/init as init process
   with arguments:
     /sbin/init
   with environment:
     HOME=/
     TERM=linux
     BOOT_IMAGE=/boot/bzImage-517rc5
     test_suspend=invalid

Fixes: 2ce986892f ("PM / sleep: Enhance test_suspend option with repeat capability")
Fixes: 27ddcc6596 ("PM / sleep: Add state field to pm_states[] entries")
Fixes: a9d7052363 ("PM: Separate suspend to RAM functionality from core")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: Igor Zhbanov <i.zhbanov@omprussia.ru>
Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Randy Dunlap 2022-02-28 14:05:44 -08:00 committed by Rafael J. Wysocki
parent ba7ffcd4c4
commit 7a64ca17e4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/power/suspend_test.c
View File

@ -157,22 +157,22 @@ static int __init setup_test_suspend(char *value)
value++; value++;
suspend_type = strsep(&value, ","); suspend_type = strsep(&value, ",");
if (!suspend_type) if (!suspend_type)
return 0; return 1;
repeat = strsep(&value, ","); repeat = strsep(&value, ",");
if (repeat) { if (repeat) {
if (kstrtou32(repeat, 0, &test_repeat_count_max)) if (kstrtou32(repeat, 0, &test_repeat_count_max))
return 0; return 1;
} }
for (i = PM_SUSPEND_MIN; i < PM_SUSPEND_MAX; i++) for (i = PM_SUSPEND_MIN; i < PM_SUSPEND_MAX; i++)
if (!strcmp(pm_labels[i], suspend_type)) { if (!strcmp(pm_labels[i], suspend_type)) {
test_state_label = pm_labels[i]; test_state_label = pm_labels[i];
return 0; return 1;
} }
printk(warn_bad_state, suspend_type); printk(warn_bad_state, suspend_type);
return 0; return 1;
} }
__setup("test_suspend", setup_test_suspend); __setup("test_suspend", setup_test_suspend);