linux-mips
[Top] [All Lists]

[PATCH] Fix sibyte watchdog initialization

To: linux-mips@linux-mips.org, ralf@linux-mips.org
Subject: [PATCH] Fix sibyte watchdog initialization
From: Guenter Roeck <guenter.roeck@ericsson.com>
Date: Tue, 13 Apr 2010 18:28:16 -0700
Cc: Guenter Roeck <guenter.roeck@ericsson.com>
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
Watchdog configuration register and timer count register were interchanged,
causing wrong values to be written into both registers.
This caused watchdog triggered resets even if the watchdog was reset in time.

Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
---
 drivers/watchdog/sb_wdog.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c
index 9748eed..1407cfa 100644
--- a/drivers/watchdog/sb_wdog.c
+++ b/drivers/watchdog/sb_wdog.c
@@ -67,8 +67,8 @@ static DEFINE_SPINLOCK(sbwd_lock);
 void sbwdog_set(char __iomem *wdog, unsigned long t)
 {
        spin_lock(&sbwd_lock);
-       __raw_writeb(0, wdog - 0x10);
-       __raw_writeq(t & 0x7fffffUL, wdog);
+       __raw_writeb(0, wdog);
+       __raw_writeq(t & 0x7fffffUL, wdog - 0x10);
        spin_unlock(&sbwd_lock);
 }
 
-- 
1.7.0.87.g0901d


<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH] Fix sibyte watchdog initialization, Guenter Roeck <=