Merge branch 'next' into for-linus

[linux-2.6-omap-h63xx.git] / drivers / watchdog / acquirewdt.c

diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c
index 28d9057c9be66f5c660b9efcda762689cbe18f76..6e46a551395c14dc4d98d5f36ce88c2af21954e9 100644 (file)
--- a/drivers/watchdog/acquirewdt.c
+++ b/drivers/watchdog/acquirewdt.c
@@ -126,7 +126,7 @@ static ssize_t acq_write(struct file *file, const char __user *buf,
                if (!nowayout) {
                        size_t i;
                        /* note: just in case someone wrote the magic character
-                        * five months ago... */
+                          five months ago... */
                        expect_close = 0;
                        /* scan to see whether or not we got the
                           magic character */
@@ -164,13 +164,6 @@ static long acq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        case WDIOC_GETBOOTSTATUS:
                return put_user(0, p);
 
-       case WDIOC_KEEPALIVE:
-               acq_keepalive();
-               return 0;
-
-       case WDIOC_GETTIMEOUT:
-         return put_user(WATCHDOG_HEARTBEAT, p);
-
        case WDIOC_SETOPTIONS:
        {
                if (get_user(options, p))
@@ -185,6 +178,13 @@ static long acq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                }
                return retval;
        }
+       case WDIOC_KEEPALIVE:
+               acq_keepalive();
+               return 0;
+
+       case WDIOC_GETTIMEOUT:
+               return put_user(WATCHDOG_HEARTBEAT, p);
+
        default:
                return -ENOTTY;
        }