From d30374e19742ad7648849f3c2cfe9517dac16767 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Fri, 23 Dec 2011 19:25:42 +0100 Subject: [PATCH] --- yaml --- r: 282216 b: refs/heads/master c: 86955e2bcb320bf8f271443cb7b03896fc3cbd67 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/ath79_wdt.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 90bb45f26ac6..5fe8ec675ba6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60daac4a9084d5a6216443f428d0060c42eb44ff +refs/heads/master: 86955e2bcb320bf8f271443cb7b03896fc3cbd67 diff --git a/trunk/drivers/watchdog/ath79_wdt.c b/trunk/drivers/watchdog/ath79_wdt.c index 725c84bfdd76..9db808349f8b 100644 --- a/trunk/drivers/watchdog/ath79_wdt.c +++ b/trunk/drivers/watchdog/ath79_wdt.c @@ -68,17 +68,23 @@ static int max_timeout; static inline void ath79_wdt_keepalive(void) { ath79_reset_wr(AR71XX_RESET_REG_WDOG, wdt_freq * timeout); + /* flush write */ + ath79_reset_rr(AR71XX_RESET_REG_WDOG); } static inline void ath79_wdt_enable(void) { ath79_wdt_keepalive(); ath79_reset_wr(AR71XX_RESET_REG_WDOG_CTRL, WDOG_CTRL_ACTION_FCR); + /* flush write */ + ath79_reset_rr(AR71XX_RESET_REG_WDOG_CTRL); } static inline void ath79_wdt_disable(void) { ath79_reset_wr(AR71XX_RESET_REG_WDOG_CTRL, WDOG_CTRL_ACTION_NONE); + /* flush write */ + ath79_reset_rr(AR71XX_RESET_REG_WDOG_CTRL); } static int ath79_wdt_set_timeout(int val)