From abb50f780602b46c221fcc20a99503036a079ba1 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Wed, 15 Oct 2008 22:04:17 -0700 Subject: [PATCH] --- yaml --- r: 114894 b: refs/heads/master c: d05abab9a47d3245664eee413769af2e1e4b1faf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/ds1286.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 64d1b457452e..b05afd350593 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4cea5ceb4c692ff42a2848f1b559977caff3c64e +refs/heads/master: d05abab9a47d3245664eee413769af2e1e4b1faf diff --git a/trunk/drivers/char/ds1286.c b/trunk/drivers/char/ds1286.c index fb584938c9c3..5329d482b582 100644 --- a/trunk/drivers/char/ds1286.c +++ b/trunk/drivers/char/ds1286.c @@ -443,7 +443,6 @@ static void ds1286_get_time(struct rtc_time *rtc_tm) { unsigned char save_control; unsigned long flags; - unsigned long uip_watchdog = jiffies; /* * read RTC once any update in progress is done. The update @@ -456,8 +455,7 @@ static void ds1286_get_time(struct rtc_time *rtc_tm) */ if (ds1286_is_updating() != 0) - while (time_before(jiffies, uip_watchdog + 2*HZ/100)) - barrier(); + msleep(20); /* * Only the values that we read from the RTC are set. We leave