From fec769b61df4e8f28b1c87059554c08e9dcc893f Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Sat, 1 Nov 2008 06:32:20 +0100
Subject: [PATCH] --- yaml --- r: 118410 b: refs/heads/master c:
 ee04448d8871e71f55520d62cf6adbf5dd403c99 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/mv643xx_eth.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 61bacaa1313b..ff6d859cc45e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d19ecfc65ed01bac7a58f83004057ad704ee7cc
+refs/heads/master: ee04448d8871e71f55520d62cf6adbf5dd403c99
diff --git a/trunk/drivers/net/mv643xx_eth.c b/trunk/drivers/net/mv643xx_eth.c
index a9c8c08044b1..b9dcdbd369f8 100644
--- a/trunk/drivers/net/mv643xx_eth.c
+++ b/trunk/drivers/net/mv643xx_eth.c
@@ -1066,9 +1066,12 @@ static int smi_wait_ready(struct mv643xx_eth_shared_private *msp)
 		return 0;
 	}
 
-	if (!wait_event_timeout(msp->smi_busy_wait, smi_is_done(msp),
-				msecs_to_jiffies(100)))
-		return -ETIMEDOUT;
+	if (!smi_is_done(msp)) {
+		wait_event_timeout(msp->smi_busy_wait, smi_is_done(msp),
+				   msecs_to_jiffies(100));
+		if (!smi_is_done(msp))
+			return -ETIMEDOUT;
+	}
 
 	return 0;
 }