---

yaml --- r: 96209 b: refs/heads/master c: 7ab267d h: refs/heads/master i: 96207: d424e42 v: v3
git-mirror · May 6, 2008 · 4bfe50b · 4bfe50b
1 parent 931a161
commit 4bfe50b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97ac8caee238d2a81c23661916f7acd3a22c85fe
+refs/heads/master: 7ab267d4ecdad3032d6bb31619a2744fc2074b59
diff --git a/trunk/drivers/net/appletalk/cops.c b/trunk/drivers/net/appletalk/cops.c
@@ -499,19 +499,13 @@ static void cops_reset(struct net_device *dev, int sleep)
         {
                 outb(0, ioaddr+DAYNA_RESET);	/* Assert the reset port */
                 inb(ioaddr+DAYNA_RESET);	/* Clear the reset */
-                if(sleep)
-                {
-                        long snap=jiffies;
-
-			/* Let card finish initializing, about 1/3 second */
-			while (time_before(jiffies, snap + HZ/3))
-                                schedule();
-                }
-                else
-                        mdelay(333);
+		if (sleep)
+			msleep(333);
+		else
+			mdelay(333);
         }
+
 	netif_wake_queue(dev);
-	return;
 }
 
 static void cops_load (struct net_device *dev)