kernel: bump 5.4 to 5.4.58

[openwrt/staging/hauke.git] / target / linux / layerscape / patches-5.4 / 701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch

diff --git a/target/linux/layerscape/patches-5.4/701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch b/target/linux/layerscape/patches-5.4/701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch
index 54fc619dd6f37858f250b5e70b32bc61d60d52b3..dcdd279204a3ccdc48fc654d4142ab7b83549fa6 100644 (file)
--- a/target/linux/layerscape/patches-5.4/701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch
@@ -156,15 +156,15 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
        err = enetc_configure_serdes(priv);
        if (err)
                dev_warn(&pdev->dev, "Attempted serdes config but failed\n");
-@@ -937,7 +942,6 @@ static int enetc_pf_probe(struct pci_dev
-       return 0;
+@@ -938,7 +943,6 @@ static int enetc_pf_probe(struct pci_dev
  
  err_reg_netdev:
+       enetc_mdio_remove(pf);
 -      enetc_of_put_phy(priv);
        enetc_free_msix(priv);
  err_alloc_msix:
        enetc_free_si_resources(priv);
-@@ -945,6 +949,7 @@ err_alloc_si_res:
+@@ -946,6 +950,7 @@ err_alloc_si_res:
        si->ndev = NULL;
        free_netdev(ndev);
  err_alloc_netdev:
@@ -172,7 +172,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
  err_map_pf_space:
        enetc_pci_remove(pdev);
  
-@@ -967,7 +972,7 @@ static void enetc_pf_remove(struct pci_d
+@@ -968,7 +973,7 @@ static void enetc_pf_remove(struct pci_d
        unregister_netdev(si->ndev);
  
        enetc_mdio_remove(pf);