shwdt: fix usage of mod_timer

PATCH Applied David Engraf 3 participants 3 messages Jul 20, 2011 – Jul 22, 2011

Subsystems (2)

SuperH Watchdog device drivers

lore

Share & tools

lore

David Engraf

author

2011-07-20 13:03 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

drivers/watchdog/shwdt.c +1 -1

index db84f23..a267dc0 100644
@@ -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;

Paul Mundt

Applied

2011-07-21 07:53 UTC #1 lore raw

Quoted 7 lines · David Engraf

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 <[email protected]>

Applied, thanks.

Wim Van Sebroeck

2011-07-22 18:32 UTC #2 lore raw

Hi Paul,

Quoted 9 lines · David Engraf

Quoted 7 lines
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 <[email protected]>
Applied, thanks.

So this patch will go via your tree then.

Kind regards,
Wim.