From ef2b0cc93d1e33db3b07e62273b290c6eaf0acce Mon Sep 17 00:00:00 2001
From: Dale Farnsworth <dale@farnsworth.org>
Date: Tue, 24 Jul 2007 11:16:29 -0700
Subject: [PATCH] --- yaml --- r: 63517 b: refs/heads/master c:
 85d57238d2ff9d95892dd1f266b85d2359d48dcc h: refs/heads/master i:   63515:
 29ae6f3d1ca3b774ec1a4a51a642af5c5e2e9b5b v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/char/watchdog/mv64x60_wdt.c | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3b569fcac02a..3b66db6a1eb4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94796f908788b3ea2b6e60e5272f4e26cea3fc22
+refs/heads/master: 85d57238d2ff9d95892dd1f266b85d2359d48dcc
diff --git a/trunk/drivers/char/watchdog/mv64x60_wdt.c b/trunk/drivers/char/watchdog/mv64x60_wdt.c
index e990e3af8be4..7b4812776382 100644
--- a/trunk/drivers/char/watchdog/mv64x60_wdt.c
+++ b/trunk/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();