Commit 6cdb6582 authored May 02, 2022 by Randy Dunlap Committed by Greg Kroah-Hartman Jun 14, 2022

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: d164f6d4 ("powerpc/4xx: Add suspend and idle support")
Reported-by: Igor Zhbanov <izh1979@gmail.com>
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20220502192941.20955-1-rdunlap@infradead.org


Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 337eef19

arch/powerpc/platforms/4xx/cpm.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -327,6 +327,6 @@ late_initcall(cpm_init);
	static int __init cpm_powersave_off(char *arg)		static int __init cpm_powersave_off(char *arg)
	{		{
	cpm.powersave_off = 1;		cpm.powersave_off = 1;
	return 0;		return 1;
	}		}
	__setup("powersave=off", cpm_powersave_off);		__setup("powersave=off", cpm_powersave_off);