Skip to content

Commit 8b2360c

Browse files
rddunlapRussell King (Oracle)
authored andcommitted
ARM: 9187/1: JIVE: fix return value of __setup handler
__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: 9db829f ("[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>
1 parent 7b83299 commit 8b2360c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,11 @@ static int __init jive_mtdset(char *options)
236236
unsigned long set;
237237

238238
if (options == NULL || options[0] == '\0')
239-
return 0;
239+
return 1;
240240

241241
if (kstrtoul(options, 10, &set)) {
242242
printk(KERN_ERR "failed to parse mtdset=%s\n", options);
243-
return 0;
243+
return 1;
244244
}
245245

246246
switch (set) {
@@ -255,7 +255,7 @@ static int __init jive_mtdset(char *options)
255255
"using default.", set);
256256
}
257257

258-
return 0;
258+
return 1;
259259
}
260260

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

0 commit comments

Comments
 (0)