aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorVitaly Wool <vitalywool@gmail.com>2006-09-11 06:42:39 -0400
committerWim Van Sebroeck <wim@iguana.be>2006-10-02 17:05:38 -0400
commit65a64ec3b4fc904932b832c53e5a86d56b972682 (patch)
tree59f5a01ae048fbe47b43263bd8efd4927a2778f2 /drivers/char
parent99d2853ac953900962d8191788060e80766eb214 (diff)
[WATCHDOG] pnx4008: add cpu_relax()
Added cpu_relax as suggested by Alan Cox. Signed-off-by: Vitaly Wool <vitalywool@gmail.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/watchdog/pnx4008_wdt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/watchdog/pnx4008_wdt.c b/drivers/char/watchdog/pnx4008_wdt.c
index 359168e63c1d..e7f0450a939d 100644
--- a/drivers/char/watchdog/pnx4008_wdt.c
+++ b/drivers/char/watchdog/pnx4008_wdt.c
@@ -104,7 +104,8 @@ static void wdt_enable(void)
104 /* stop counter, initiate counter reset */ 104 /* stop counter, initiate counter reset */
105 __raw_writel(RESET_COUNT, WDTIM_CTRL(wdt_base)); 105 __raw_writel(RESET_COUNT, WDTIM_CTRL(wdt_base));
106 /*wait for reset to complete. 100% guarantee event */ 106 /*wait for reset to complete. 100% guarantee event */
107 while (__raw_readl(WDTIM_COUNTER(wdt_base))); 107 while (__raw_readl(WDTIM_COUNTER(wdt_base)))
108 cpu_relax();
108 /* internal and external reset, stop after that */ 109 /* internal and external reset, stop after that */
109 __raw_writel(M_RES2 | STOP_COUNT0 | RESET_COUNT0, 110 __raw_writel(M_RES2 | STOP_COUNT0 | RESET_COUNT0,
110 WDTIM_MCTRL(wdt_base)); 111 WDTIM_MCTRL(wdt_base));