git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'picoxcell/soc' into next/soc
[pandora-kernel.git]
/
drivers
/
watchdog
/
shwdt.c
diff --git
a/drivers/watchdog/shwdt.c
b/drivers/watchdog/shwdt.c
index
db84f23
..
a267dc0
100644
(file)
--- 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;
* 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;
static const struct watchdog_info sh_wdt_info;
static struct platform_device *sh_wdt_dev;