This is a note to let you know that I've just added the patch titled
net: ethernet: mtk_eth_soc: remove duplicate if statements
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-ethernet-mtk_eth_soc-remove-duplicate-if-statements.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From amadeus@xxxxxxxxxx Mon Jan 22 09:48:15 2024
From: Chukun Pan <amadeus@xxxxxxxxxx>
Date: Mon, 22 Jan 2024 21:02:19 +0800
Subject: net: ethernet: mtk_eth_soc: remove duplicate if statements
To: Sasha Levin <sashal@xxxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, stable@xxxxxxxxxxxxxxx, Chukun Pan <amadeus@xxxxxxxxxx>
Message-ID: <20240122130219.220316-1-amadeus@xxxxxxxxxx>
From: Chukun Pan <amadeus@xxxxxxxxxx>
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()")
Cc: Liu Jian <liujian56@xxxxxxxxxx>
Cc: Russell King (Oracle) <rmk+kernel@xxxxxxxxxxxxxxx>
Cc: Jakub Kicinski <kuba@xxxxxxxxxx>
Cc: Sasha Levin <sashal@xxxxxxxxxx>
Signed-off-by: Chukun Pan <amadeus@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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
Patches currently in stable-queue which might be from amadeus@xxxxxxxxxx are
queue-5.4/net-ethernet-mtk_eth_soc-remove-duplicate-if-statements.patch
