Commit cdb0e6dc authored by Claudiu Manoil's avatar Claudiu Manoil Committed by David S. Miller
Browse files

enetc: Fix mdio bus removal on PF probe bailout 

This is the correct resolution for the conflict from
merging the "net" tree fix:
commit 26cb7085 ("enetc: Remove the mdio bus on PF probe bailout")
with the "net-next" new work:
commit 07095c02 ("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: a57066b1 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net"

)
Signed-off-by: default avatarClaudiu Manoil <claudiu.manoil@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ee460417

drivers/net/ethernet/freescale/enetc/enetc_pf.c

+1 −1
Original line number Diff line number Diff line
@@ -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);