aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/watchdog/w83697hf_wdt.c
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2006-09-07 05:57:00 -0400
committerWim Van Sebroeck <wim@iguana.be>2006-10-04 16:43:39 -0400
commiteb64419e397aaea55b2ef6904e86b6263a80acc7 (patch)
tree7061b20eb38d947ed83ad0528a8c8e4ceb176bc9 /drivers/char/watchdog/w83697hf_wdt.c
parentdb16525e63f8cf554696045e0e360b81e2263279 (diff)
[WATCHDOG] w83697hf/hg WDT driver - patch 4
This is patch 4 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - limits the watchdog timeout to 1-63 while this device accepts 1-255. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/char/watchdog/w83697hf_wdt.c')
-rw-r--r--drivers/char/watchdog/w83697hf_wdt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/watchdog/w83697hf_wdt.c b/drivers/char/watchdog/w83697hf_wdt.c
index 12bdcab17b9e..94b1655e70ca 100644
--- a/drivers/char/watchdog/w83697hf_wdt.c
+++ b/drivers/char/watchdog/w83697hf_wdt.c
@@ -54,7 +54,7 @@ MODULE_PARM_DESC(wdt_io, "w83697hf WDT io port (default 0x2E)");
54 54
55static int timeout = WATCHDOG_TIMEOUT; /* in seconds */ 55static int timeout = WATCHDOG_TIMEOUT; /* in seconds */
56module_param(timeout, int, 0); 56module_param(timeout, int, 0);
57MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=63, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) "."); 57MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=255, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
58 58
59static int nowayout = WATCHDOG_NOWAYOUT; 59static int nowayout = WATCHDOG_NOWAYOUT;
60module_param(nowayout, int, 0); 60module_param(nowayout, int, 0);
@@ -143,7 +143,7 @@ wdt_disable(void)
143static int 143static int
144wdt_set_heartbeat(int t) 144wdt_set_heartbeat(int t)
145{ 145{
146 if ((t < 1) || (t > 63)) 146 if ((t < 1) || (t > 255))
147 return -EINVAL; 147 return -EINVAL;
148 148
149 timeout = t; 149 timeout = t;
@@ -317,7 +317,7 @@ wdt_init(void)
317 317
318 if (wdt_set_heartbeat(timeout)) { 318 if (wdt_set_heartbeat(timeout)) {
319 wdt_set_heartbeat(WATCHDOG_TIMEOUT); 319 wdt_set_heartbeat(WATCHDOG_TIMEOUT);
320 printk (KERN_INFO PFX "timeout value must be 1<=timeout<=63, using %d\n", 320 printk (KERN_INFO PFX "timeout value must be 1<=timeout<=255, using %d\n",
321 WATCHDOG_TIMEOUT); 321 WATCHDOG_TIMEOUT);
322 } 322 }
323 323