1 files changed, 18 insertions, 18 deletions

diff --git a/drivers/watchdog/sc1200wdt.c b/drivers/watchdog/sc1200wdt.c
index 03e67fa4d689..f3bdc8227cc4 100644
--- a/drivers/watchdog/sc1200wdt.c
+++ b/drivers/watchdog/sc1200wdt.c
@@ -207,24 +207,6 @@ static long sc1200wdt_ioctl(struct file *file, unsigned int cmd,
         case WDIOC_GETBOOTSTATUS:
                 return put_user(0, p);
 
-        case WDIOC_KEEPALIVE:
-                sc1200wdt_write_data(WDTO, timeout);
-                return 0;
-
-        case WDIOC_SETTIMEOUT:
-                if (get_user(new_timeout, p))
-                        return -EFAULT;
-                /* the API states this is given in secs */
-                new_timeout /= 60;
-                if (new_timeout < 0 || new_timeout > MAX_TIMEOUT)
-                        return -EINVAL;
-                timeout = new_timeout;
-                sc1200wdt_write_data(WDTO, timeout);
-                /* fall through and return the new timeout */
-
-        case WDIOC_GETTIMEOUT:
-                return put_user(timeout * 60, p);
-
         case WDIOC_SETOPTIONS:
         {
                 int options, retval = -EINVAL;
@@ -244,6 +226,24 @@ static long sc1200wdt_ioctl(struct file *file, unsigned int cmd,
 
                 return retval;
         }
+        case WDIOC_KEEPALIVE:
+                sc1200wdt_write_data(WDTO, timeout);
+                return 0;
+
+        case WDIOC_SETTIMEOUT:
+                if (get_user(new_timeout, p))
+                        return -EFAULT;
+                /* the API states this is given in secs */
+                new_timeout /= 60;
+                if (new_timeout < 0 || new_timeout > MAX_TIMEOUT)
+                        return -EINVAL;
+                timeout = new_timeout;
+                sc1200wdt_write_data(WDTO, timeout);
+                /* fall through and return the new timeout */
+
+        case WDIOC_GETTIMEOUT:
+                return put_user(timeout * 60, p);
+
         default:
                 return -ENOTTY;
         }