Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85d57238 authored by Dale Farnsworth's avatar Dale Farnsworth Committed by Wim Van Sebroeck
Browse files

[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: default avatarDale Farnsworth <dale@farnsworth.org>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 94796f90

drivers/char/watchdog/mv64x60_wdt.c

+10 −1
Original line number Diff line number Diff line
@@ -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();