diff options
| author | David Engraf <david.engraf@sysgo.com> | 2011-07-20 09:03:39 -0400 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2011-08-02 04:22:49 -0400 |
| commit | bea1906620ce72b63f83735c4cc2642b25ec54ae (patch) | |
| tree | e96e96e0068ea332a4bb8dd3334f4de8c3d2e7f8 /drivers | |
| parent | c027a474a68065391c8773f6e83ed5412657e369 (diff) | |
watchdog: shwdt: fix usage of mod_timer
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>
Cc: stable <stable@kernel.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 @@ | |||
| 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 | */ |
| 66 | static int clock_division_ratio = WTCSR_CKS_4096; | 66 | static 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 | ||
| 69 | static const struct watchdog_info sh_wdt_info; | 69 | static const struct watchdog_info sh_wdt_info; |
| 70 | static struct platform_device *sh_wdt_dev; | 70 | static struct platform_device *sh_wdt_dev; |