diff --git a/[refs] b/[refs]
index 77ac7c1ce80f..e95b7e80ac82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76e61eaa55e33ea51205fad633393d1ae10311c5
+refs/heads/master: e4540aa94f9b3e75528d9091524e7d82a0650f10
diff --git a/trunk/drivers/net/cpmac.c b/trunk/drivers/net/cpmac.c
index 7b311c6d14ab..645e6442dc48 100644
--- a/trunk/drivers/net/cpmac.c
+++ b/trunk/drivers/net/cpmac.c
@@ -1245,11 +1245,11 @@ int __devinit cpmac_init(void)
 
 	cpmac_mii->reset(cpmac_mii);
 
-	for (i = 0; i < 300000; i++)
+	for (i = 0; i < 300; i++)
 		if ((mask = cpmac_read(cpmac_mii->priv, CPMAC_MDIO_ALIVE)))
 			break;
 		else
-			cpu_relax();
+			msleep(10);
 
 	mask &= 0x7fffffff;
 	if (mask & (mask - 1)) {