---

yaml --- r: 224534 b: refs/heads/master c: de855b9 h: refs/heads/master v: v3
git-mirror · Nov 29, 2010 · ad05c38 · ad05c38
1 parent be23ec6
commit ad05c38
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)