5.4-stable patches

added patches:
	net-ethernet-mtk_eth_soc-remove-duplicate-if-statements.patch

diff --git a/queue-5.4/net-ethernet-mtk_eth_soc-remove-duplicate-if-statements.patch b/queue-5.4/net-ethernet-mtk_eth_soc-remove-duplicate-if-statements.patch
new file mode 100644 (file)
index 0000000..1bd3033
--- /dev/null
+++ b/queue-5.4/net-ethernet-mtk_eth_soc-remove-duplicate-if-statements.patch
@@ -0,0 +1,39 @@
+From amadeus@jmu.edu.cn  Mon Jan 22 09:48:15 2024
+From: Chukun Pan <amadeus@jmu.edu.cn>
+Date: Mon, 22 Jan 2024 21:02:19 +0800
+Subject: net: ethernet: mtk_eth_soc: remove duplicate if statements
+To: Sasha Levin <sashal@kernel.org>
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Chukun Pan <amadeus@jmu.edu.cn>
+Message-ID: <20240122130219.220316-1-amadeus@jmu.edu.cn>
+
+From: Chukun Pan <amadeus@jmu.edu.cn>
+
+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@huawei.com>
+Cc: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
+Cc: Jakub Kicinski <kuba@kernel.org>
+Cc: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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(&eth->dma_refcnt)) {
+               int err = mtk_start_dma(eth);
+ 
+-              if (err)
+               if (err) {
+                       phylink_disconnect_phy(mac->phylink);
+                       return err;
+-- 
+2.25.1
+

diff --git a/queue-5.4/series b/queue-5.4/series
index 1d5d4fb50b0e5960ee7213ceb5b335d4b36fae2b..8b23c99f49ed03fa67cf6314131c7c7054b7dad2 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -140,3 +140,4 @@ binder-fix-async-space-check-for-0-sized-buffers.patch
 binder-fix-use-after-free-in-shinker-s-callback.patch
 input-atkbd-use-ab83-as-id-when-skipping-the-getid-command.patch
 revert-asoc-atmel-remove-system-clock-tree-configuration-for-at91sam9g20ek.patch
+net-ethernet-mtk_eth_soc-remove-duplicate-if-statements.patch