From e03831f3b03097b6f7c7374d08ab5138b7962901 Mon Sep 17 00:00:00 2001
From: Jonas Bonn <jonas@southpole.se>
Date: Fri, 11 Jun 2010 02:47:39 +0000
Subject: [PATCH] --- yaml --- r: 202901 b: refs/heads/master c:
 b46773db64c264a6600f58d9da1ae43708b47fda h: refs/heads/master i:   202899:
 ddcc5b77c5086ca1fbeba7d2b8e022a2fc80193e v: v3

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

diff --git a/[refs] b/[refs]
index 6a22c621caad..c0655a6d87fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2cbc8ef9facf60afa62e04bde91fb5fcac9a5683
+refs/heads/master: b46773db64c264a6600f58d9da1ae43708b47fda
diff --git a/trunk/drivers/net/ethoc.c b/trunk/drivers/net/ethoc.c
index e5c2f5b1d439..1681f081ff6f 100644
--- a/trunk/drivers/net/ethoc.c
+++ b/trunk/drivers/net/ethoc.c
@@ -613,8 +613,11 @@ static int ethoc_mdio_write(struct mii_bus *bus, int phy, int reg, u16 val)
 
 	while (time_before(jiffies, timeout)) {
 		u32 stat = ethoc_read(priv, MIISTATUS);
-		if (!(stat & MIISTATUS_BUSY))
+		if (!(stat & MIISTATUS_BUSY)) {
+			/* reset MII command register */
+			ethoc_write(priv, MIICOMMAND, 0);
 			return 0;
+		}
 
 		schedule();
 	}