]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commita0b562a8ac7aa2b87a078034a221b6c0d2e19dd3
treee1211cb00a1423a2abf783d16a6a96d0469a7634
parentd7b15549a112cd5de8cd0eca05aeef27428edcb2
enetc: Fix mdio bus removal on PF probe bailout

This is the correct resolution for the conflict from
merging the "net" tree fix:
commit bb0c739b16ee ("enetc: Remove the mdio bus on PF probe bailout")
with the "net-next" new work:
commit 538075226fa1 ("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: e376093f27f9 ("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