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();