From f26e670fcebda3130c95338d5a35c11a4c18708e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 22 Jan 2024 11:54:52 -0800 Subject: [PATCH] drop queue-5.4/net-ethernet-mtk_eth_soc-remove-duplicate-if-statements.patch Went to wrong tree. --- ...h_soc-remove-duplicate-if-statements.patch | 39 ------------------- queue-5.4/series | 1 - 2 files changed, 40 deletions(-) delete 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 deleted file mode 100644 index 1bd30335497..00000000000 --- a/queue-5.4/net-ethernet-mtk_eth_soc-remove-duplicate-if-statements.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 05c8cb245d3..20ac2922b49 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -155,4 +155,3 @@ usb-mon-fix-atomicity-violation-in-mon_bin_vma_fault.patch alsa-oxygen-fix-right-channel-of-capture-volume-mixer.patch fbdev-flush-deferred-work-in-fb_deferred_io_fsync.patch rootfs-fix-support-for-rootfstype-when-root-is-given.patch -net-ethernet-mtk_eth_soc-remove-duplicate-if-statements.patch -- 2.47.3