---

yaml --- r: 190431 b: refs/heads/master c: 9bd7371 h: refs/heads/master i: 190429: ed330a7 190427: 90fb374 190423: dfc4f33 190415: af67b51 190399: 4a28363 v: v3
git-mirror · Apr 28, 2010 · 0c477f0 · 0c477f0
1 parent 9d99567
commit 0c477f0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;