diff options
author | Wim Van Sebroeck <wim@iguana.be> | 2009-05-11 14:33:00 -0400 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2009-06-18 03:30:57 -0400 |
commit | e73a780272a46e897bd94a4870fd6b6a8655d2d4 (patch) | |
tree | 514890ee239af2ddd97a0ac130df6af11013dcf0 /drivers/watchdog/indydog.c | |
parent | b6bf291f1c5bc84272a138b7367741e459005a81 (diff) |
[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.c | 4 |
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) | |||
83 | indydog_start(); | 83 | indydog_start(); |
84 | indydog_ping(); | 84 | indydog_ping(); |
85 | 85 | ||
86 | indydog_alive = 1; | ||
87 | printk(KERN_INFO "Started watchdog timer.\n"); | 86 | printk(KERN_INFO "Started watchdog timer.\n"); |
88 | 87 | ||
89 | return nonseekable_open(inode, file); | 88 | return nonseekable_open(inode, file); |
@@ -113,8 +112,7 @@ static long indydog_ioctl(struct file *file, unsigned int cmd, | |||
113 | { | 112 | { |
114 | int options, retval = -EINVAL; | 113 | int options, retval = -EINVAL; |
115 | static struct watchdog_info ident = { | 114 | static struct watchdog_info ident = { |
116 | .options = WDIOF_KEEPALIVEPING | | 115 | .options = WDIOF_KEEPALIVEPING, |
117 | WDIOF_MAGICCLOSE, | ||
118 | .firmware_version = 0, | 116 | .firmware_version = 0, |
119 | .identity = "Hardware Watchdog for SGI IP22", | 117 | .identity = "Hardware Watchdog for SGI IP22", |
120 | }; | 118 | }; |