]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
of_mdio: avoid MDIO bus removal when a PHY is missing
authorMadalin Bucur <madalin.bucur@nxp.com>
Tue, 9 Jan 2018 12:43:34 +0000 (14:43 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 10 Jan 2018 20:07:47 +0000 (15:07 -0500)
If one of the child devices is missing the of_mdiobus_register_phy()
call will return -ENODEV. When a missing device is encountered the
registration of the remaining PHYs is stopped and the MDIO bus will
fail to register. Propagate all errors except ENODEV to avoid it.

Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/of/of_mdio.c

index 3481e69738b5f94d18cc393f77934fac7cfc7fdc..a327be1d264b8cea389feeb91423bb24a6a0d688 100644 (file)
@@ -231,7 +231,12 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
                        rc = of_mdiobus_register_phy(mdio, child, addr);
                else
                        rc = of_mdiobus_register_device(mdio, child, addr);
-               if (rc)
+
+               if (rc == -ENODEV)
+                       dev_err(&mdio->dev,
+                               "MDIO device at address %d is missing.\n",
+                               addr);
+               else if (rc)
                        goto unregister;
        }
 
@@ -255,7 +260,7 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
 
                        if (of_mdiobus_child_is_phy(child)) {
                                rc = of_mdiobus_register_phy(mdio, child, addr);
-                               if (rc)
+                               if (rc && rc != -ENODEV)
                                        goto unregister;
                        }
                }