From 0c477f0a7b8f41609d65ab49e65c6be450c3e11d Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Wed, 28 Apr 2010 01:07:29 -0600
Subject: [PATCH] --- yaml --- r: 190431 b: refs/heads/master c:
 9bd73715a1f83f640937c121d22fa8dbaab73002 h: refs/heads/master i:   190429:
 ed330a7e91976f0233034ad67ca33a020acecf27   190427:
 90fb3744d0feafe8d456d0a6cb5f1cf29016c8f5   190423:
 dfc4f337a3da0828650aa4f9a2cb07a56e80b33b   190415:
 af67b514dd3727d37c78b40282271c523f59c1c9   190399:
 4a283639679446a256222a92069df42cfa64872d v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/of/of_mdio.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;