diff options
| author | David Engraf | 2011-07-20 15:03:39 +0200 |
|---|---|---|
| committer | Paul Mundt | 2011-07-21 09:17:07 +0200 |
| commit | b4300b72cfc01ea75b8aaede574bdfb04545d691 (patch) | |
| tree | 1cfde16f8a5b2715c105afc3c54727dbd368ef5f /drivers | |
| parent | clocksource: sh_cmt: wait for CMCNT on init V2 (diff) | |
| download | kernel-qcow2-linux-b4300b72cfc01ea75b8aaede574bdfb04545d691.tar.gz kernel-qcow2-linux-b4300b72cfc01ea75b8aaede574bdfb04545d691.tar.xz kernel-qcow2-linux-b4300b72cfc01ea75b8aaede574bdfb04545d691.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/shwdt.c | 2 |
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 @@ * misses its deadline, the kernel timer will allow the WDT to overflow. */ static int clock_division_ratio = WTCSR_CKS_4096; -#define next_ping_period(cks) msecs_to_jiffies(cks - 4) +#define next_ping_period(cks) (jiffies + msecs_to_jiffies(cks - 4)) static const struct watchdog_info sh_wdt_info; static struct platform_device *sh_wdt_dev; |