diff options
author | David Engraf <david.engraf@sysgo.com> | 2011-07-20 15:03:39 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-04 21:58:42 -0700 |
commit | f9e4715d434299f8897e3edfed9b6dc90629ffda (patch) | |
tree | 7b24a336b6154cb9720a545e58b31d7f5ea959c2 | |
parent | 52880922de44a7950283451b06db5aec0fc34a99 (diff) | |
download | kernel_samsung_smdk4412-f9e4715d434299f8897e3edfed9b6dc90629ffda.zip kernel_samsung_smdk4412-f9e4715d434299f8897e3edfed9b6dc90629ffda.tar.gz kernel_samsung_smdk4412-f9e4715d434299f8897e3edfed9b6dc90629ffda.tar.bz2 |
watchdog: shwdt: fix usage of mod_timer
commit bea1906620ce72b63f83735c4cc2642b25ec54ae upstream.
Fix the usage of mod_timer() and make 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>
Signed-off-by: Wim Van sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-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 db84f23..a267dc0 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; |