1 files changed, 14 insertions, 14 deletions

diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index bb79f649dc7e..2313f44144f8 100644
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@ -137,23 +137,9 @@ static long at91_wdt_ioct(struct file *file,
         int new_value;
 
         switch (cmd) {
-        case WDIOC_KEEPALIVE:
-                at91_wdt_reload();      /* pat the watchdog */
-                return 0;
         case WDIOC_GETSUPPORT:
                 return copy_to_user(argp, &at91_wdt_info,
                                 sizeof(at91_wdt_info)) ? -EFAULT : 0;
-        case WDIOC_SETTIMEOUT:
-                if (get_user(new_value, p))
-                        return -EFAULT;
-                if (at91_wdt_settimeout(new_value))
-                        return -EINVAL;
-                /* Enable new time value */
-                at91_wdt_start();
-                /* Return current value */
-                return put_user(wdt_time, p);
-        case WDIOC_GETTIMEOUT:
-                return put_user(wdt_time, p);
         case WDIOC_GETSTATUS:
         case WDIOC_GETBOOTSTATUS:
                 return put_user(0, p);
@@ -165,6 +151,20 @@ static long at91_wdt_ioct(struct file *file,
                 if (new_value & WDIOS_ENABLECARD)
                         at91_wdt_start();
                 return 0;
+        case WDIOC_KEEPALIVE:
+                at91_wdt_reload();      /* pat the watchdog */
+                return 0;
+        case WDIOC_SETTIMEOUT:
+                if (get_user(new_value, p))
+                        return -EFAULT;
+                if (at91_wdt_settimeout(new_value))
+                        return -EINVAL;
+                /* Enable new time value */
+                at91_wdt_start();
+                /* Return current value */
+                return put_user(wdt_time, p);
+        case WDIOC_GETTIMEOUT:
+                return put_user(wdt_time, p);
         default:
                 return -ENOTTY;
         }