diff --git a/[refs] b/[refs]
index 7ea0b166d3ea..09f0d0432c4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0c06027c7d18d99e6f5e81382a7f06a8080b084
+refs/heads/master: 9bd73715a1f83f640937c121d22fa8dbaab73002
diff --git a/trunk/drivers/of/of_mdio.c b/trunk/drivers/of/of_mdio.c
index 18ecae4a4375..b4748337223b 100644
--- a/trunk/drivers/of/of_mdio.c
+++ b/trunk/drivers/of/of_mdio.c
@@ -69,7 +69,7 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
 		}
 
 		phy = get_phy_device(mdio, be32_to_cpup(addr));
-		if (!phy) {
+		if (!phy || IS_ERR(phy)) {
 			dev_err(&mdio->dev, "error probing PHY at address %i\n",
 				*addr);
 			continue;