enetc: Fix mdio bus removal on PF probe bailout
authorClaudiu Manoil <claudiu.manoil@nxp.com>
Fri, 11 Sep 2020 10:16:35 +0000 (13:16 +0300)
committerDavid S. Miller <davem@davemloft.net>
Fri, 11 Sep 2020 21:47:57 +0000 (14:47 -0700)
commitcdb0e6dccc1fd0f7096d333d90cad0ac81c2b342
treee1211cb00a1423a2abf783d16a6a96d0469a7634
parentee460417d254d941dfea5fb7cff841f589643992
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>
drivers/net/ethernet/freescale/enetc/enetc_pf.c