diff options
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/ds1286.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/ds1286.c b/drivers/char/ds1286.c index 59146e3365ba..ea35ab2c9909 100644 --- a/drivers/char/ds1286.c +++ b/drivers/char/ds1286.c | |||
@@ -39,6 +39,7 @@ | |||
39 | #include <linux/spinlock.h> | 39 | #include <linux/spinlock.h> |
40 | #include <linux/bcd.h> | 40 | #include <linux/bcd.h> |
41 | #include <linux/proc_fs.h> | 41 | #include <linux/proc_fs.h> |
42 | #include <linux/jiffies.h> | ||
42 | 43 | ||
43 | #include <asm/uaccess.h> | 44 | #include <asm/uaccess.h> |
44 | #include <asm/system.h> | 45 | #include <asm/system.h> |
@@ -451,7 +452,7 @@ static void ds1286_get_time(struct rtc_time *rtc_tm) | |||
451 | */ | 452 | */ |
452 | 453 | ||
453 | if (ds1286_is_updating() != 0) | 454 | if (ds1286_is_updating() != 0) |
454 | while (jiffies - uip_watchdog < 2*HZ/100) | 455 | while (time_before(jiffies, uip_watchdog + 2*HZ/100)) |
455 | barrier(); | 456 | barrier(); |
456 | 457 | ||
457 | /* | 458 | /* |