summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadalin Bucur <madalin.bucur@nxp.com>2018-01-09 14:43:34 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-03-03 10:24:37 +0100
commite69660fdecda3bb58e8f3e9e7b0dc36efbad1b96 (patch)
tree488b5ebda9a802687f75743a0610e1b072c2b47d
parent83d9e9c211fe885d03e9acb425be3cf55c1d3bd8 (diff)
downloadlinux-exynos-e69660fdecda3bb58e8f3e9e7b0dc36efbad1b96.tar.gz
linux-exynos-e69660fdecda3bb58e8f3e9e7b0dc36efbad1b96.tar.bz2
linux-exynos-e69660fdecda3bb58e8f3e9e7b0dc36efbad1b96.zip
of_mdio: avoid MDIO bus removal when a PHY is missing
[ Upstream commit 95f566de0269a0c59fd6a737a147731302136429 ] 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> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/of/of_mdio.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index 98258583abb0..8c1819230ed2 100644
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -228,7 +228,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;
}
@@ -252,7 +257,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;
}
}