summaryrefslogtreecommitdiff
path: root/drivers/watchdog/indydog.c
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2009-05-11 22:33:00 +0400
committerWim Van Sebroeck <wim@iguana.be>2009-06-18 11:30:57 +0400
commite73a780272a46e897bd94a4870fd6b6a8655d2d4 (patch)
tree514890ee239af2ddd97a0ac130df6af11013dcf0 /drivers/watchdog/indydog.c
parentb6bf291f1c5bc84272a138b7367741e459005a81 (diff)
downloadlinux-e73a780272a46e897bd94a4870fd6b6a8655d2d4.tar.xz
[WATCHDOG] Correct WDIOF_MAGICCLOSE flag
Make sure that when the WDIOF_MAGICCLOSE flag is set we also support the magic-close feature... Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/indydog.c')
-rw-r--r--drivers/watchdog/indydog.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/watchdog/indydog.c b/drivers/watchdog/indydog.c
index 0f761db9a27c..bea8a124a559 100644
--- a/drivers/watchdog/indydog.c
+++ b/drivers/watchdog/indydog.c
@@ -83,7 +83,6 @@ static int indydog_open(struct inode *inode, struct file *file)
indydog_start();
indydog_ping();
- indydog_alive = 1;
printk(KERN_INFO "Started watchdog timer.\n");
return nonseekable_open(inode, file);
@@ -113,8 +112,7 @@ static long indydog_ioctl(struct file *file, unsigned int cmd,
{
int options, retval = -EINVAL;
static struct watchdog_info ident = {
- .options = WDIOF_KEEPALIVEPING |
- WDIOF_MAGICCLOSE,
+ .options = WDIOF_KEEPALIVEPING,
.firmware_version = 0,
.identity = "Hardware Watchdog for SGI IP22",
};