aboutsummaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2005-08-19 23:31:41 +0200
committerWim Van Sebroeck <wim@iguana.be>2005-09-11 22:11:40 +0200
commit266aa1c4b3d004123d330eb412cc26a3d10f9029 (patch)
tree823db05ca5e63f0787842741d4ff221f13152c21 /drivers/char
parentcd7b80079b120406de902ee1eaa2dbdaa867dada (diff)
[WATCHDOG] driver-for-ibm-automatic-server-restart-watchdog-fix2.patch
The device/watchdog has a fixed timeout/heartbeat. So we don't support the WDIOC_SETTIMEOUT ioctl call and we also may not set the WDIOF_SETTIMEOUT flag. Cc: Andrey Panin <pazke@donpac.ru> Cc: Andrew Morton <akpm@osdl.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/watchdog/ibmasr.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/char/watchdog/ibmasr.c b/drivers/char/watchdog/ibmasr.c
index 4f90015be7d..294c474ae48 100644
--- a/drivers/char/watchdog/ibmasr.c
+++ b/drivers/char/watchdog/ibmasr.c
@@ -246,7 +246,7 @@ static int asr_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
static const struct watchdog_info ident = {
- .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT |
+ .options = WDIOF_KEEPALIVEPING |
WDIOF_MAGICCLOSE,
.identity = "IBM ASR"
};
@@ -268,14 +268,9 @@ static int asr_ioctl(struct inode *inode, struct file *file,
return 0;
/*
- * The hardware has a fixed timeout value, so WDIOC_SETTIMEOUT
- * is a noop and WDIOC_GETTIMEOUT always returns 256.
+ * The hardware has a fixed timeout value, so no WDIOC_SETTIMEOUT
+ * and WDIOC_GETTIMEOUT always returns 256.
*/
- case WDIOC_SETTIMEOUT:
- if (get_user(heartbeat, p))
- return -EFAULT;
- /* Fall */
-
case WDIOC_GETTIMEOUT:
heartbeat = 256;
return put_user(heartbeat, p);