From ad05c3827c5633b81bd7624423d572f67041d293 Mon Sep 17 00:00:00 2001
From: Szymon Janc <szymon@janc.net.pl>
Date: Sat, 27 Nov 2010 08:39:48 +0000
Subject: [PATCH] --- yaml --- r: 224534 b: refs/heads/master c:
 de855b992d75e49816eb09231764e7a63a4f555d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 248b3b0e1f33..8fde1e476117 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34cf97eb255b09751f1eb1b5573813e9ea3fe21f
+refs/heads/master: de855b992d75e49816eb09231764e7a63a4f555d
diff --git a/trunk/drivers/net/forcedeth.c b/trunk/drivers/net/forcedeth.c
index 2f092d75d78e..2fd1ae9e13b5 100644
--- a/trunk/drivers/net/forcedeth.c
+++ b/trunk/drivers/net/forcedeth.c
@@ -1178,7 +1178,7 @@ static int phy_reset(struct net_device *dev, u32 bmcr_setup)
 
 	/* must wait till reset is deasserted */
 	while (miicontrol & BMCR_RESET) {
-		msleep(10);
+		usleep_range(10000, 20000);
 		miicontrol = mii_rw(dev, np->phyaddr, MII_BMCR, MII_READ);
 		/* FIXME: 100 tries seem excessive */
 		if (tries++ > 100)