aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Engraf <david.engraf@sysgo.com>2011-07-20 09:03:39 -0400
committerPaul Mundt <lethal@linux-sh.org>2011-07-21 03:17:07 -0400
commitb4300b72cfc01ea75b8aaede574bdfb04545d691 (patch)
tree1cfde16f8a5b2715c105afc3c54727dbd368ef5f
parent3f7e5e2423f6233f7665d54061ba7761ca90cf52 (diff)
shwdt: fix usage of mod_timer
This patch fixes the usage of mod_timer and makes the driver usable. mod_timer must be called with an absolute timeout in jiffies, the old implementation used a relative timeout thus the hardware watchdog was never triggered. Signed-off-by: David Engraf <david.engraf@sysgo.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--drivers/watchdog/shwdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/shwdt.c b/drivers/watchdog/shwdt.c
index db84f2322d1a..a267dc078daf 100644
--- a/drivers/watchdog/shwdt.c
+++ b/drivers/watchdog/shwdt.c
@@ -64,7 +64,7 @@
64 * misses its deadline, the kernel timer will allow the WDT to overflow. 64 * misses its deadline, the kernel timer will allow the WDT to overflow.
65 */ 65 */
66static int clock_division_ratio = WTCSR_CKS_4096; 66static int clock_division_ratio = WTCSR_CKS_4096;
67#define next_ping_period(cks) msecs_to_jiffies(cks - 4) 67#define next_ping_period(cks) (jiffies + msecs_to_jiffies(cks - 4))
68 68
69static const struct watchdog_info sh_wdt_info; 69static const struct watchdog_info sh_wdt_info;
70static struct platform_device *sh_wdt_dev; 70static struct platform_device *sh_wdt_dev;