| From e01b042e580f1fbf4fd8da467442451da00c7a90 Mon Sep 17 00:00:00 2001 |
| From: Randy Dunlap <rdunlap@infradead.org> |
| Date: Wed, 23 Feb 2022 19:35:36 -0800 |
| Subject: net: stmmac: fix return value of __setup handler |
| |
| From: Randy Dunlap <rdunlap@infradead.org> |
| |
| commit e01b042e580f1fbf4fd8da467442451da00c7a90 upstream. |
| |
| __setup() handlers should return 1 on success, i.e., the parameter |
| has been handled. A return of 0 causes the "option=value" string to be |
| added to init's environment strings, polluting it. |
| |
| Fixes: 47dd7a540b8a ("net: add support for STMicroelectronics Ethernet controllers.") |
| Fixes: f3240e2811f0 ("stmmac: remove warning when compile as built-in (V2)") |
| 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: Giuseppe Cavallaro <peppe.cavallaro@st.com> |
| Cc: Alexandre Torgue <alexandre.torgue@foss.st.com> |
| Cc: Jose Abreu <joabreu@synopsys.com> |
| Link: https://lore.kernel.org/r/20220224033536.25056-1-rdunlap@infradead.org |
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |
| +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |
| @@ -4890,7 +4890,7 @@ static int __init stmmac_cmdline_opt(cha |
| char *opt; |
| |
| if (!str || !*str) |
| - return -EINVAL; |
| + return 1; |
| while ((opt = strsep(&str, ",")) != NULL) { |
| if (!strncmp(opt, "debug:", 6)) { |
| if (kstrtoint(opt + 6, 0, &debug)) |
| @@ -4921,11 +4921,11 @@ static int __init stmmac_cmdline_opt(cha |
| goto err; |
| } |
| } |
| - return 0; |
| + return 1; |
| |
| err: |
| pr_err("%s: ERROR broken module parameter conversion", __func__); |
| - return -EINVAL; |
| + return 1; |
| } |
| |
| __setup("stmmaceth=", stmmac_cmdline_opt); |
