[PATCH net] enetc: Fix mdio bus removal on PF probe bailout

[PATCH net] enetc: Fix mdio bus removal on PF probe bailout

[Claudiu Manoil]

This is the correct resolution for the conflict from
merging the "net" tree fix:
commit 26cb7085c898 ("enetc: Remove the mdio bus on PF probe bailout")
with the "net-next" new work:
commit 07095c025ac2 ("net: enetc: Use DT protocol information to set up the ports")
that moved mdio bus allocation to an ealier stage of
the PF probing routine.

Fixes: a57066b1a019 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net")
Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
---
 drivers/net/ethernet/freescale/enetc/enetc_pf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.c b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
index 26d5981b798f..177334f0adb1 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
@@ -1053,7 +1053,6 @@ static int enetc_pf_probe(struct pci_dev *pdev,
 
 err_reg_netdev:
 	enetc_teardown_serdes(priv);
-	enetc_mdio_remove(pf);
 	enetc_free_msix(priv);
 err_alloc_msix:
 	enetc_free_si_resources(priv);
@@ -1061,6 +1060,7 @@ static int enetc_pf_probe(struct pci_dev *pdev,
 	si->ndev = NULL;
 	free_netdev(ndev);
 err_alloc_netdev:
+	enetc_mdio_remove(pf);
 	enetc_of_put_phy(pf);
 err_map_pf_space:
 	enetc_pci_remove(pdev);
-- 
2.17.1

Re: [PATCH net] enetc: Fix mdio bus removal on PF probe bailout

[David Miller]

From: Claudiu Manoil <claudiu.manoil@nxp.com>
Date: Fri, 11 Sep 2020 13:16:35 +0300

> This is the correct resolution for the conflict from
> merging the "net" tree fix:
> commit 26cb7085c898 ("enetc: Remove the mdio bus on PF probe bailout")
> with the "net-next" new work:
> commit 07095c025ac2 ("net: enetc: Use DT protocol information to set up the ports")
> that moved mdio bus allocation to an ealier stage of
> the PF probing routine.
> 
> Fixes: a57066b1a019 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net")
> Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>

Applied, thanks for catching this.