aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/hpwdt.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-06 12:56:40 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-06 12:56:40 -0400
commit14e71e4fb94c340273534a6d7f210aa82a3ca717 (patch)
tree668c4ebb39e94755835364d2ba16615ae8c4ec82 /drivers/watchdog/hpwdt.c
parentab195c58b864802c15e494f06ae109413e12d50b (diff)
parent8ba42bd88c6982fe224b09c33151c797b0fdf1a5 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] hpwdt - fix lower timeout limit [WATCHDOG] iTCO_wdt: TCO Watchdog patch for additional Intel Cougar Point DeviceIDs [WATCHDOG] doc: Fix use of WDIOC_SETOPTIONS ioctl. [WATCHDOG] doc: watchdog simple example: don't fail on fsync() [WATCHDOG] set max63xx driver as ARM only [WATCHDOG] powerpc: pika_wdt ident cannot be const
Diffstat (limited to 'drivers/watchdog/hpwdt.c')
-rw-r--r--drivers/watchdog/hpwdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 72f5a3707b48..809e7167a624 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -442,7 +442,7 @@ static void hpwdt_ping(void)
442static int hpwdt_change_timer(int new_margin) 442static int hpwdt_change_timer(int new_margin)
443{ 443{
444 /* Arbitrary, can't find the card's limits */ 444 /* Arbitrary, can't find the card's limits */
445 if (new_margin < 30 || new_margin > 600) { 445 if (new_margin < 5 || new_margin > 600) {
446 printk(KERN_WARNING 446 printk(KERN_WARNING
447 "hpwdt: New value passed in is invalid: %d seconds.\n", 447 "hpwdt: New value passed in is invalid: %d seconds.\n",
448 new_margin); 448 new_margin);