From f0fa67f0e9d80fedc1acb2a7f1f2b596bada697b Mon Sep 17 00:00:00 2001
From: Krzysztof Halasa <khc@pm.waw.pl>
Date: Wed, 17 Dec 2008 00:24:13 -0800
Subject: [PATCH] --- yaml --- r: 119950 b: refs/heads/master c:
 e8e5752dc0a56a01527055b0c37510b1d6b6b861 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/net/phy/mdio_bus.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d2fbcae45def..53481f80db4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a3de25544dadab1971847f28f33b1cd0d1770a6
+refs/heads/master: e8e5752dc0a56a01527055b0c37510b1d6b6b861
diff --git a/trunk/drivers/net/phy/mdio_bus.c b/trunk/drivers/net/phy/mdio_bus.c
index 536bda1f428b..289fc267edf3 100644
--- a/trunk/drivers/net/phy/mdio_bus.c
+++ b/trunk/drivers/net/phy/mdio_bus.c
@@ -105,8 +105,6 @@ int mdiobus_register(struct mii_bus *bus)
 		return -EINVAL;
 	}
 
-	bus->state = MDIOBUS_REGISTERED;
-
 	mutex_init(&bus->mdio_lock);
 
 	if (bus->reset)
@@ -123,6 +121,9 @@ int mdiobus_register(struct mii_bus *bus)
 		}
 	}
 
+	if (!err)
+		bus->state = MDIOBUS_REGISTERED;
+
 	pr_info("%s: probed\n", bus->name);
 
 	return err;