From 254176e175dfa292d8428a536f2b9e4c17c0cf16 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 22 Jan 2024 09:50:19 -0800 Subject: [PATCH] 5.4-stable patches added patches: net-ethernet-mtk_eth_soc-remove-duplicate-if-statements.patch --- ...h_soc-remove-duplicate-if-statements.patch | 39 +++++++++++++++++++ queue-5.4/series | 1 + 2 files changed, 40 insertions(+) create mode 100644 queue-5.4/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 index 00000000000..1bd30335497 --- /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 +Date: Mon, 22 Jan 2024 21:02:19 +0800 +Subject: net: ethernet: mtk_eth_soc: remove duplicate if statements +To: Sasha Levin +Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chukun Pan +Message-ID: <20240122130219.220316-1-amadeus@jmu.edu.cn> + +From: 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()") +Cc: Liu Jian +Cc: Russell King (Oracle) +Cc: Jakub Kicinski +Cc: Sasha Levin +Signed-off-by: Chukun Pan +Signed-off-by: Greg Kroah-Hartman +--- + 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 + diff --git a/queue-5.4/series b/queue-5.4/series index 1d5d4fb50b0..8b23c99f49e 100644 --- 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 -- 2.47.3