---

yaml --- r: 91375 b: refs/heads/master c: b132fba h: refs/heads/master i: 91373: c6b1ee9 91371: 30f75fe 91367: b09029e 91359: 13eb3fc v: v3
git-mirror · Apr 20, 2008 · 4fd2bda · 4fd2bda
1 parent afae6e4
commit 4fd2bda
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 420635f517cf1bb8929caf80ce5a30e827b9df42
+refs/heads/master: b132fba18bb5e30ed13ce3c623c18eb1e5795534
diff --git a/trunk/drivers/net/appletalk/cops.c b/trunk/drivers/net/appletalk/cops.c
@@ -69,6 +69,7 @@ static const char *version =
 #include <linux/atalk.h>
 #include <linux/spinlock.h>
 #include <linux/bitops.h>
+#include <linux/jiffies.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
@@ -503,7 +504,7 @@ static void cops_reset(struct net_device *dev, int sleep)
                         long snap=jiffies;
 
 			/* Let card finish initializing, about 1/3 second */
-	                while(jiffies-snap<HZ/3)
+			while (time_before(jiffies, snap + HZ/3))
                                 schedule();
                 }
                 else