aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/w83697hf_wdt.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/watchdog/w83697hf_wdt.c')
-rw-r--r--drivers/watchdog/w83697hf_wdt.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/watchdog/w83697hf_wdt.c b/drivers/watchdog/w83697hf_wdt.c
index 12bd6618ed5e..445d30a01ed3 100644
--- a/drivers/watchdog/w83697hf_wdt.c
+++ b/drivers/watchdog/w83697hf_wdt.c
@@ -218,7 +218,7 @@ static ssize_t wdt_write(struct file *file, const char __user *buf,
218 218
219 for (i = 0; i != count; i++) { 219 for (i = 0; i != count; i++) {
220 char c; 220 char c;
221 if (get_user(c, buf+i)) 221 if (get_user(c, buf + i))
222 return -EFAULT; 222 return -EFAULT;
223 if (c == 'V') 223 if (c == 'V')
224 expect_close = 42; 224 expect_close = 42;
@@ -325,10 +325,9 @@ static int wdt_close(struct inode *inode, struct file *file)
325static int wdt_notify_sys(struct notifier_block *this, unsigned long code, 325static int wdt_notify_sys(struct notifier_block *this, unsigned long code,
326 void *unused) 326 void *unused)
327{ 327{
328 if (code == SYS_DOWN || code == SYS_HALT) { 328 if (code == SYS_DOWN || code == SYS_HALT)
329 /* Turn the WDT off */ 329 wdt_disable(); /* Turn the WDT off */
330 wdt_disable(); 330
331 }
332 return NOTIFY_DONE; 331 return NOTIFY_DONE;
333} 332}
334 333
@@ -414,7 +413,7 @@ static int __init wdt_init(void)
414 w83697hf_init(); 413 w83697hf_init();
415 if (early_disable) { 414 if (early_disable) {
416 if (wdt_running()) 415 if (wdt_running())
417 printk (KERN_WARNING PFX "Stopping previously enabled watchdog until userland kicks in\n"); 416 printk(KERN_WARNING PFX "Stopping previously enabled watchdog until userland kicks in\n");
418 wdt_disable(); 417 wdt_disable();
419 } 418 }
420 419