diff options
| author |   Claudiu Manoil <claudiu.manoil@nxp.com> | 2020-09-11 13:16:35 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-09-11 14:47:57 -0700 |
| commit | cdb0e6dccc1fd0f7096d333d90cad0ac81c2b342 (patch) | |
| tree | e1211cb00a1423a2abf783d16a6a96d0469a7634 | |
| parent | net: dec: de2104x: Increase receive ring size for Tulip (diff) | |
| download | wireguard-linux-cdb0e6dccc1fd0f7096d333d90cad0ac81c2b342.tar.xz wireguard-linux-cdb0e6dccc1fd0f7096d333d90cad0ac81c2b342.zip | |
enetc: Fix mdio bus removal on PF probe bailout
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/freescale/enetc/enetc_pf.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ err_alloc_si_res: 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); |