Commit fe8aaab8 authored Mar 12, 2022 by Randy Dunlap Committed by Greg Kroah-Hartman Apr 20, 2022

ARM: 9187/1: JIVE: fix return value of __setup handler



[ Upstream commit 8b2360c7157b462c4870d447d1e65d30ef31f9aa ]

__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 jive_mtdset().

Fixes: 9db829f4 ("[ARM] JIVE: Initial machine support for Logitech Jive")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Alim Akhtar <alim.akhtar@samsung.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: patches@armlinux.org.uk
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 71c2ea70

arch/arm/mach-s3c24xx/mach-jive.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -240,11 +240,11 @@ static int __init jive_mtdset(char *options)
		unsigned long set;

		if (options == NULL \|\| options[0] == '\0')
		return 0;
		return 1;

		if (kstrtoul(options, 10, &set)) {
		printk(KERN_ERR "failed to parse mtdset=%s\n", options);
		return 0;
		return 1;
		}

		switch (set) {
		@@ -259,7 +259,7 @@ static int __init jive_mtdset(char *options)
		"using default.", set);
		}

		return 0;
		return 1;
		}

		/* parse the mtdset= option given to the kernel command line */