---

yaml --- r: 37981 b: refs/heads/master c: 65a64ec h: refs/heads/master i: 37979: c10da1b v: v3
git-mirror · Oct 2, 2006 · 622988a · 622988a
1 parent d0e941c
commit 622988a
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: 99d2853ac953900962d8191788060e80766eb214
+refs/heads/master: 65a64ec3b4fc904932b832c53e5a86d56b972682
diff --git a/trunk/drivers/char/watchdog/pnx4008_wdt.c b/trunk/drivers/char/watchdog/pnx4008_wdt.c
@@ -104,7 +104,8 @@ static void wdt_enable(void)
 	/* stop counter, initiate counter reset */
 	__raw_writel(RESET_COUNT, WDTIM_CTRL(wdt_base));
 	/*wait for reset to complete. 100% guarantee event */
-	while (__raw_readl(WDTIM_COUNTER(wdt_base)));
+	while (__raw_readl(WDTIM_COUNTER(wdt_base)))
+		cpu_relax();
 	/* internal and external reset, stop after that */
 	__raw_writel(M_RES2 | STOP_COUNT0 | RESET_COUNT0,
 		WDTIM_MCTRL(wdt_base));