| Message ID | 20220223000623.5920-1-rdunlap@infradead.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | scsi: aha152x: fix aha152x_setup() __setup handler return value | expand |
Randy, > __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). Applied to 5.18/scsi-staging, thanks!
On Tue, 22 Feb 2022 16:06:23 -0800, Randy Dunlap wrote: > __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. > > [...] Applied to 5.18/scsi-queue, thanks! [1/1] scsi: aha152x: fix aha152x_setup() __setup handler return value https://git.kernel.org/mkp/scsi/c/cc8294ec4738
--- linux-next-20220217.orig/drivers/scsi/aha152x.c +++ linux-next-20220217/drivers/scsi/aha152x.c @@ -3375,13 +3375,11 @@ static int __init aha152x_setup(char *st setup[setup_count].synchronous = ints[0] >= 6 ? ints[6] : 1; setup[setup_count].delay = ints[0] >= 7 ? ints[7] : DELAY_DEFAULT; setup[setup_count].ext_trans = ints[0] >= 8 ? ints[8] : 0; - if (ints[0] > 8) { /*}*/ + if (ints[0] > 8) printk(KERN_NOTICE "aha152x: usage: aha152x=<IOBASE>[,<IRQ>[,<SCSI ID>" "[,<RECONNECT>[,<PARITY>[,<SYNCHRONOUS>[,<DELAY>[,<EXT_TRANS>]]]]]]]\n"); - } else { + else setup_count++; - return 0; - } return 1; }
__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. Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Reported-by: Igor Zhbanov <i.zhbanov@omprussia.ru> Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru Cc: "Juergen E. Fischer" <fischer@norbit.de> Cc: "James E.J. Bottomley" <jejb@linux.ibm.com> Cc: "Martin K. Petersen" <martin.petersen@oracle.com> --- Builds but not tested -- no such hardware. drivers/scsi/aha152x.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)