5.10-stable review patch. If anyone has any objections, please let me know.
------------------
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(-)
--- 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 *d if (!refcount_read(ð->dma_refcnt)) { int err = mtk_start_dma(eth);
- if (err) if (err) { phylink_disconnect_phy(mac->phylink); return err;