---

yaml --- r: 114894 b: refs/heads/master c: d05abab h: refs/heads/master v: v3
git-mirror · Oct 16, 2008 · abb50f7 · abb50f7
1 parent 6b0e058
commit abb50f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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