From 96e8afcdb07f6ba0ed816af0d1ee8ed17bb5eb9d Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Fri, 15 Jul 2011 11:04:02 -0400 Subject: [PATCH] --- yaml --- r: 261097 b: refs/heads/master c: 081d83a3393f65adc94fc4240b9926be3054f9dc h: refs/heads/master i: 261095: 800bc01865edf4d25bf1fbfdc83a175c05189518 v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/sp805_wdt.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6ce80c84ac75..86de08b5fd2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da3e515024ba32aaf0d524518ce39a8fb77332cd +refs/heads/master: 081d83a3393f65adc94fc4240b9926be3054f9dc diff --git a/trunk/drivers/watchdog/sp805_wdt.c b/trunk/drivers/watchdog/sp805_wdt.c index c1e099aa57f3..cc2cfbe33b30 100644 --- a/trunk/drivers/watchdog/sp805_wdt.c +++ b/trunk/drivers/watchdog/sp805_wdt.c @@ -134,6 +134,8 @@ static void wdt_enable(void) writel(INT_ENABLE | RESET_ENABLE, wdt->base + WDTCONTROL); writel(LOCK, wdt->base + WDTLOCK); + /* Flush posted writes. */ + readl(wdt->base + WDTLOCK); spin_unlock(&wdt->lock); } @@ -146,6 +148,8 @@ static void wdt_disable(void) writel(0, wdt->base + WDTCONTROL); writel(LOCK, wdt->base + WDTLOCK); + /* Flush posted writes. */ + readl(wdt->base + WDTLOCK); spin_unlock(&wdt->lock); }