diff options
| author | Dale Farnsworth | 2007-07-24 20:16:29 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck | 2007-07-24 23:16:15 +0200 |
| commit | 85d57238d2ff9d95892dd1f266b85d2359d48dcc (patch) | |
| tree | c1141dfe2a22d3b354296acca2ed201b4543955e /drivers/char/watchdog/mv64x60_wdt.c | |
| parent | [WATCHDOG] mv64x60_wdt: Support for WDIOC_SETTIMEOUT ioctl (diff) | |
| download | kernel-qcow2-linux-85d57238d2ff9d95892dd1f266b85d2359d48dcc.tar.gz kernel-qcow2-linux-85d57238d2ff9d95892dd1f266b85d2359d48dcc.tar.xz kernel-qcow2-linux-85d57238d2ff9d95892dd1f266b85d2359d48dcc.zip | |
[WATCHDOG] mv64x60_wdt: Add WDIOC_SETOPTIONS ioctl support
Allow the watchdog timer to be enabled or disabled via the
WDIOC_SETOPTIONS ioctl.
Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/char/watchdog/mv64x60_wdt.c')
| -rw-r--r-- | drivers/char/watchdog/mv64x60_wdt.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/char/watchdog/mv64x60_wdt.c b/drivers/char/watchdog/mv64x60_wdt.c index e990e3af8be4..7b4812776382 100644 --- a/drivers/char/watchdog/mv64x60_wdt.c +++ b/drivers/char/watchdog/mv64x60_wdt.c @@ -132,6 +132,7 @@ static int mv64x60_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { int timeout; + int options; void __user *argp = (void __user *)arg; static struct watchdog_info info = { .options = WDIOF_SETTIMEOUT | @@ -157,7 +158,15 @@ static int mv64x60_wdt_ioctl(struct inode *inode, struct file *file, return -EOPNOTSUPP; case WDIOC_SETOPTIONS: - return -EOPNOTSUPP; + if (get_user(options, (int __user *)argp)) + return -EFAULT; + + if (options & WDIOS_DISABLECARD) + mv64x60_wdt_handler_disable(); + + if (options & WDIOS_ENABLECARD) + mv64x60_wdt_handler_enable(); + break; case WDIOC_KEEPALIVE: mv64x60_wdt_service(); |