Commit f9e4715d authored by David Engraf's avatar David Engraf Committed by Greg Kroah-Hartman

watchdog: shwdt: fix usage of mod_timer

commit bea19066 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: default avatarDavid Engraf <david.engraf@sysgo.com>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarWim Van sebroeck <wim@iguana.be>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 52880922
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
* misses its deadline, the kernel timer will allow the WDT to overflow. * misses its deadline, the kernel timer will allow the WDT to overflow.
*/ */
static int clock_division_ratio = WTCSR_CKS_4096; 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 const struct watchdog_info sh_wdt_info;
static struct platform_device *sh_wdt_dev; static struct platform_device *sh_wdt_dev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment