---

yaml --- r: 95215 b: refs/heads/master c: ac0e4b7 h: refs/heads/master i: 95213: 473cb4f 95211: 1ef41c0 95207: 3f8ef04 95199: fdbfb75 v: v3
git-mirror · Apr 30, 2008 · f7a56a7 · f7a56a7
1 parent 03b23b3
commit f7a56a7
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: d6f6341a6475eb7f9c2b948a7d0fd56fd16ad675
+refs/heads/master: ac0e4b7d319bf284bb64bc7e1c051417386b34a4
diff --git a/trunk/drivers/char/ds1286.c b/trunk/drivers/char/ds1286.c
@@ -39,6 +39,7 @@
 #include <linux/spinlock.h>
 #include <linux/bcd.h>
 #include <linux/proc_fs.h>
+#include <linux/jiffies.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -451,7 +452,7 @@ static void ds1286_get_time(struct rtc_time *rtc_tm)
 	 */
 
 	if (ds1286_is_updating() != 0)
-		while (jiffies - uip_watchdog < 2*HZ/100)
+		while (time_before(jiffies, uip_watchdog + 2*HZ/100))
 			barrier();
 
 	/*