From 622988a2250ff981911eb5bd3a5b0cadfb8c96b7 Mon Sep 17 00:00:00 2001 From: Vitaly Wool Date: Mon, 11 Sep 2006 14:42:39 +0400 Subject: [PATCH] --- yaml --- r: 37981 b: refs/heads/master c: 65a64ec3b4fc904932b832c53e5a86d56b972682 h: refs/heads/master i: 37979: c10da1bbef7e1ca07f7772e9ca3b502d0d2a83d7 v: v3 --- [refs] | 2 +- trunk/drivers/char/watchdog/pnx4008_wdt.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9366d33c1cb3..15d1974cf510 100644 --- 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 index 359168e63c1d..e7f0450a939d 100644 --- 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));