X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fchar%2Fds1286.c;h=ea35ab2c9909490bb490bb51eae47d39c31661b3;hb=1b40a895df6c7d5a80e71f65674060b03d84bbef;hp=59146e3365bac8bbda37b45d33297c0c9d071b7e;hpb=4e337adae4e960f64043b9f433c4a825c902616c;p=linux-2.6

diff --git a/drivers/char/ds1286.c b/drivers/char/ds1286.c
index 59146e3365..ea35ab2c99 100644
--- a/drivers/char/ds1286.c
+++ b/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();
 
 	/*