Commit f5dea755 authored by Wim Van Sebroeck's avatar Wim Van Sebroeck Committed by Linus Torvalds

[PATCH] watchdog: indydog.c update

<wim@iguana.be> (04/06/27 1.1770)
   [WATCHDOG] indydog.c-patch-20040627
   
   * Fix: since we use the new module_param's: make sure that
   linux/moduleparam.h stays included
   * in the release code we can just use indydog_stop();

The ChangeSets can also be looked at on:
	http://linux-watchdog.bkbits.net:8080/linux-2.6-watchdogSigned-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7b4032e7
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/config.h> #include <linux/config.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
...@@ -87,12 +88,9 @@ static int indydog_release(struct inode *inode, struct file *file) ...@@ -87,12 +88,9 @@ static int indydog_release(struct inode *inode, struct file *file)
{ {
/* Shut off the timer. /* Shut off the timer.
* Lock it in if it's a module and we defined ...NOWAYOUT */ * Lock it in if it's a module and we defined ...NOWAYOUT */
if (!nowayout) { if (!nowayout)
u32 mc_ctrl0 = sgimc->cpuctrl0; indydog_stop(); /* Turn the WDT off */
mc_ctrl0 &= ~SGIMC_CCTRL0_WDOG;
sgimc->cpuctrl0 = mc_ctrl0;
printk(KERN_INFO "Stopped watchdog timer.\n");
}
indydog_alive = 0; indydog_alive = 0;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment