diff options
| author | Sean Anderson | 2021-04-15 13:06:09 -0400 |
|---|---|---|
| committer | Stefano Babic | 2021-05-02 12:46:54 +0200 |
| commit | cd4359194ba5e3bb8706b3d4051ea967bf978595 (patch) | |
| tree | 5d0438f67f019cb5ae361be5a0cec5cb9805b132 /drivers/net | |
| parent | eccd132974f1f66247e72bbf3fd2bab71ab7d10e (diff) | |
net: fec: Only unregister MII bus if we registered it
If we fail to probe for whatever reason, we cannot unregister/free the
MII bus unless we registered it with fec_get_miibus. This fixes FECs
sharing an MDIO bus from destroying it, preventing the other FEC from
using it.
Fixes: 6a895d039b ("net: Update eQos driver and FEC driver to use eth phy interfaces")
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/fec_mxc.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 59f5a14e54e..4fd5c01b4ae 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1355,6 +1355,7 @@ static void fec_gpio_reset(struct fec_priv *priv) static int fecmxc_probe(struct udevice *dev) { + bool dm_mii_bus = true; struct eth_pdata *pdata = dev_get_plat(dev); struct fec_priv *priv = dev_get_priv(dev); struct mii_dev *bus = NULL; @@ -1462,6 +1463,7 @@ static int fecmxc_probe(struct udevice *dev) #endif if (!bus) { + dm_mii_bus = false; #ifdef CONFIG_FEC_MXC_MDIO_BASE bus = fec_get_miibus((ulong)CONFIG_FEC_MXC_MDIO_BASE, dev_seq(dev)); @@ -1507,8 +1509,10 @@ static int fecmxc_probe(struct udevice *dev) return 0; err_phy: - mdio_unregister(bus); - free(bus); + if (!dm_mii_bus) { + mdio_unregister(bus); + free(bus); + } err_mii: err_timeout: fec_free_descs(priv); |