Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/ath5k/base.c
	net/8021q/vlan_core.c

1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index e521d2cebad6..b13fbc4ebd87 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -1064,9 +1064,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;
 }