mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
fb42176cd1
Import commits from upstream Linux replacing some downstream patches.
Move accepted patches from pending-{5.15,6.1} to backport-{5.15,6.1}.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From 8110437e59616293228cd781c486d8495a61e36a Mon Sep 17 00:00:00 2001
|
|
From: Yan Cangang <nalanzeyu@gmail.com>
|
|
Date: Sun, 20 Nov 2022 13:52:58 +0800
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: fix resource leak in error path
|
|
|
|
In mtk_probe(), when mtk_ppe_init() or mtk_eth_offload_init() failed,
|
|
mtk_mdio_cleanup() isn't called. Fix it.
|
|
|
|
Fixes: ba37b7caf1ed ("net: ethernet: mtk_eth_soc: add support for initializing the PPE")
|
|
Fixes: 502e84e2382d ("net: ethernet: mtk_eth_soc: add flow offloading support")
|
|
Signed-off-by: Yan Cangang <nalanzeyu@gmail.com>
|
|
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -4087,13 +4087,13 @@ static int mtk_probe(struct platform_dev
|
|
eth->soc->offload_version, i);
|
|
if (!eth->ppe[i]) {
|
|
err = -ENOMEM;
|
|
- goto err_free_dev;
|
|
+ goto err_deinit_mdio;
|
|
}
|
|
}
|
|
|
|
err = mtk_eth_offload_init(eth);
|
|
if (err)
|
|
- goto err_free_dev;
|
|
+ goto err_deinit_mdio;
|
|
}
|
|
|
|
for (i = 0; i < MTK_MAX_DEVS; i++) {
|