Skip to content

Commit

Permalink
[WATCHDOG] mv64x60_wdt: Add WDIOC_SETOPTIONS ioctl support
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dale Farnsworth authored and Wim Van Sebroeck committed Jul 24, 2007
1 parent 94796f9 commit 85d5723
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion drivers/char/watchdog/mv64x60_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand All @@ -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();
Expand Down

0 comments on commit 85d5723

Please sign in to comment.