* [PATCH 5.10.y 1/1] net: ethernet: mtk_eth_soc: remove duplicate if statements
@ 2024-01-22 13:02 Chukun Pan
2024-01-22 17:49 ` Greg Kroah-Hartman
0 siblings, 1 reply; 2+ messages in thread
From: Chukun Pan @ 2024-01-22 13:02 UTC (permalink / raw)
To: Sasha Levin; +Cc: Greg Kroah-Hartman, stable, Chukun Pan
It seems that there was something wrong with backport,
causing `if (err)` to appear twice in the same place.
Fixes: da86a63479e ("net: ethernet: mtk_eth_soc: fix error handling in mtk_open()")
Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
---
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index aa9e616cc1d5..011210e6842d 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -2302,7 +2302,6 @@ static int mtk_open(struct net_device *dev)
if (!refcount_read(ð->dma_refcnt)) {
int err = mtk_start_dma(eth);
- if (err)
if (err) {
phylink_disconnect_phy(mac->phylink);
return err;
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 5.10.y 1/1] net: ethernet: mtk_eth_soc: remove duplicate if statements
2024-01-22 13:02 [PATCH 5.10.y 1/1] net: ethernet: mtk_eth_soc: remove duplicate if statements Chukun Pan
@ 2024-01-22 17:49 ` Greg Kroah-Hartman
0 siblings, 0 replies; 2+ messages in thread
From: Greg Kroah-Hartman @ 2024-01-22 17:49 UTC (permalink / raw)
To: Chukun Pan; +Cc: Sasha Levin, stable
On Mon, Jan 22, 2024 at 09:02:19PM +0800, Chukun Pan wrote:
> It seems that there was something wrong with backport,
> causing `if (err)` to appear twice in the same place.
>
> Fixes: da86a63479e ("net: ethernet: mtk_eth_soc: fix error handling in mtk_open()")
> Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
> ---
> drivers/net/ethernet/mediatek/mtk_eth_soc.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
> index aa9e616cc1d5..011210e6842d 100644
> --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
> +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
> @@ -2302,7 +2302,6 @@ static int mtk_open(struct net_device *dev)
> if (!refcount_read(ð->dma_refcnt)) {
> int err = mtk_start_dma(eth);
>
> - if (err)
> if (err) {
> phylink_disconnect_phy(mac->phylink);
> return err;
> --
> 2.25.1
>
>
Now queued up, thanks. Odd that no one actually caught this, I guess
the driver is NOT being built by any type of test configurations? Why
is that?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-01-22 17:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-22 13:02 [PATCH 5.10.y 1/1] net: ethernet: mtk_eth_soc: remove duplicate if statements Chukun Pan
2024-01-22 17:49 ` Greg Kroah-Hartman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox