From 4bfe50bbad555378566605f2271c33a0d04bd396 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@garzik.org>
Date: Tue, 6 May 2008 12:16:24 -0400
Subject: [PATCH] --- yaml --- r: 96209 b: refs/heads/master c:
 7ab267d4ecdad3032d6bb31619a2744fc2074b59 h: refs/heads/master i:   96207:
 d424e4267ba4f1fff4dd7d3aadc4e5838e7c681d v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/net/appletalk/cops.c | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index a1e7ba8e40e1..9566c2bf6fd3 100644
--- 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
index 82e9a5bd0dd2..a0b4c8516073 100644
--- 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)