Skip to content

Commit 8224b8f

Browse files
rddunlapgregkh
authored andcommitted
powerpc/4xx/cpm: Fix return value of __setup() handler
[ Upstream commit 5bb99fd4090fe1acfdb90a97993fcda7f8f5a3d6 ] __setup() handlers should return 1 to obsolete_checksetup() in init/main.c to indicate that the boot option has been handled. A return of 0 causes the boot option/value to be listed as an Unknown kernel parameter and added to init's (limited) argument or environment strings. Also, error return codes don't mean anything to obsolete_checksetup() -- only non-zero (usually 1) or zero. So return 1 from cpm_powersave_off(). Fixes: d164f6d ("powerpc/4xx: Add suspend and idle support") Reported-by: Igor Zhbanov <[email protected]> Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Sasha Levin <[email protected]>
1 parent 847e0f9 commit 8224b8f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/powerpc/sysdev/ppc4xx_cpm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,6 @@ late_initcall(cpm_init);
341341
static int __init cpm_powersave_off(char *arg)
342342
{
343343
cpm.powersave_off = 1;
344-
return 0;
344+
return 1;
345345
}
346346
__setup("powersave=off", cpm_powersave_off);

0 commit comments

Comments
 (0)