kernel: bump 5.15 to 5.15.123

[openwrt/staging/hauke.git] / target / linux / generic / backport-5.15 / 728-v6.1-01-net-ethernet-mtk_eth_soc-fix-possible-memory-leak-in.patch

diff --git a/target/linux/generic/backport-5.15/728-v6.1-01-net-ethernet-mtk_eth_soc-fix-possible-memory-leak-in.patch b/target/linux/generic/backport-5.15/728-v6.1-01-net-ethernet-mtk_eth_soc-fix-possible-memory-leak-in.patch
index b41318afd76de5bfbbad17048b76a40772cf1afb..624e0178bf8c17f76a5a8c5e95cc742bcbfce674 100644 (file)
--- a/target/linux/generic/backport-5.15/728-v6.1-01-net-ethernet-mtk_eth_soc-fix-possible-memory-leak-in.patch
+++ b/target/linux/generic/backport-5.15/728-v6.1-01-net-ethernet-mtk_eth_soc-fix-possible-memory-leak-in.patch
@@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -4011,19 +4011,23 @@ static int mtk_probe(struct platform_dev
+@@ -4004,19 +4004,23 @@ static int mtk_probe(struct platform_dev
                        eth->irq[i] = platform_get_irq(pdev, i);
                if (eth->irq[i] < 0) {
                        dev_err(&pdev->dev, "no IRQ%d resource found\n", i);
@@ -45,7 +45,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                        }
                        eth->clks[i] = NULL;
                }
-@@ -4034,7 +4038,7 @@ static int mtk_probe(struct platform_dev
+@@ -4027,7 +4031,7 @@ static int mtk_probe(struct platform_dev
  
        err = mtk_hw_init(eth);
        if (err)
@@ -54,7 +54,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        eth->hwlro = MTK_HAS_CAPS(eth->soc->caps, MTK_HWLRO);
  
-@@ -4132,6 +4136,8 @@ err_free_dev:
+@@ -4125,6 +4129,8 @@ err_free_dev:
        mtk_free_dev(eth);
  err_deinit_hw:
        mtk_hw_deinit(eth);
@@ -63,7 +63,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        return err;
  }
-@@ -4151,6 +4157,7 @@ static int mtk_remove(struct platform_de
+@@ -4144,6 +4150,7 @@ static int mtk_remove(struct platform_de
                phylink_disconnect_phy(mac->phylink);
        }