leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[WATCHDOG] driver-for-ibm-automatic-server-restart-watchdog-fix2.patch

Browse Source 
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>
This commit is contained in:
Wim Van Sebroeck 2005-08-19 23:31:41 +02:00
parent cd7b80079b
commit 266aa1c4b3
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/char/watchdog/ibmasr.c
View File

@ -246,7 +246,7 @@ static int asr_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
static const struct watchdog_info ident = { static const struct watchdog_info ident = {
.options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | .options = WDIOF_KEEPALIVEPING |
WDIOF_MAGICCLOSE, WDIOF_MAGICCLOSE,
.identity = "IBM ASR" .identity = "IBM ASR"
}; };
@ -268,14 +268,9 @@ static int asr_ioctl(struct inode *inode, struct file *file,
return 0; return 0;
/* /*
* The hardware has a fixed timeout value, so WDIOC_SETTIMEOUT * The hardware has a fixed timeout value, so no WDIOC_SETTIMEOUT
* is a noop and WDIOC_GETTIMEOUT always returns 256. * and WDIOC_GETTIMEOUT always returns 256.
*/ */
case WDIOC_SETTIMEOUT:
if (get_user(heartbeat, p))
return -EFAULT;
/* Fall */
case WDIOC_GETTIMEOUT: case WDIOC_GETTIMEOUT:
heartbeat = 256; heartbeat = 256;
return put_user(heartbeat, p); return put_user(heartbeat, p);