mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 08:26:59 +00:00
enetc: Fix mdio bus removal on PF probe bailout
This is the correct resolution for the conflict from merging the "net" tree fix: commit26cb7085c8
("enetc: Remove the mdio bus on PF probe bailout") with the "net-next" new work: commit07095c025a
("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:a57066b1a0
("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net") Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
ee460417d2
commit
cdb0e6dccc
1 changed files with 1 additions and 1 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue