Skip to content

Commit b8fa10d

Browse files
rddunlapgregkh
authored andcommitted
scsi: aha152x: Fix aha152x_setup() __setup handler return value
[ Upstream commit cc8294e ] __setup() handlers should return 1 if the command line option is handled and 0 if not (or maybe never return 0; doing so just pollutes init's environment with strings that are not init arguments/parameters). Return 1 from aha152x_setup() to indicate that the boot option has been handled. Link: lore.kernel.org/r/[email protected] Link: https://lore.kernel.org/r/[email protected] Cc: "Juergen E. Fischer" <[email protected]> Cc: "James E.J. Bottomley" <[email protected]> Cc: "Martin K. Petersen" <[email protected]> Reported-by: Igor Zhbanov <[email protected]> Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 556ec50 commit b8fa10d

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/scsi/aha152x.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3370,13 +3370,11 @@ static int __init aha152x_setup(char *str)
33703370
setup[setup_count].synchronous = ints[0] >= 6 ? ints[6] : 1;
33713371
setup[setup_count].delay = ints[0] >= 7 ? ints[7] : DELAY_DEFAULT;
33723372
setup[setup_count].ext_trans = ints[0] >= 8 ? ints[8] : 0;
3373-
if (ints[0] > 8) { /*}*/
3373+
if (ints[0] > 8)
33743374
printk(KERN_NOTICE "aha152x: usage: aha152x=<IOBASE>[,<IRQ>[,<SCSI ID>"
33753375
"[,<RECONNECT>[,<PARITY>[,<SYNCHRONOUS>[,<DELAY>[,<EXT_TRANS>]]]]]]]\n");
3376-
} else {
3376+
else
33773377
setup_count++;
3378-
return 0;
3379-
}
33803378

33813379
return 1;
33823380
}

0 commit comments

Comments
 (0)