Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[linux-2.6] / drivers / watchdog / ibmasr.c

diff --git a/drivers/watchdog/ibmasr.c b/drivers/watchdog/ibmasr.c
index 6824bf80b37e783b530d02ed189c5dec96ff66ee..b82405cfb4cd38534bac8235c8720b7382af5a05 100644 (file)
--- a/drivers/watchdog/ibmasr.c
+++ b/drivers/watchdog/ibmasr.c
@@ -275,7 +275,7 @@ static long asr_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        static const struct watchdog_info ident = {
                .options =      WDIOF_KEEPALIVEPING |
                                WDIOF_MAGICCLOSE,
-               .identity =     "IBM ASR"
+               .identity =     "IBM ASR",
        };
        void __user *argp = (void __user *)arg;
        int __user *p = argp;
@@ -287,16 +287,6 @@ static long asr_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        case WDIOC_GETSTATUS:
        case WDIOC_GETBOOTSTATUS:
                return put_user(0, p);
-       case WDIOC_KEEPALIVE:
-               asr_toggle();
-               return 0;
-       /*
-        * The hardware has a fixed timeout value, so no WDIOC_SETTIMEOUT
-        * and WDIOC_GETTIMEOUT always returns 256.
-        */
-       case WDIOC_GETTIMEOUT:
-               heartbeat = 256;
-               return put_user(heartbeat, p);
        case WDIOC_SETOPTIONS:
        {
                int new_options, retval = -EINVAL;
@@ -313,6 +303,16 @@ static long asr_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                }
                return retval;
        }
+       case WDIOC_KEEPALIVE:
+               asr_toggle();
+               return 0;
+       /*
+        * The hardware has a fixed timeout value, so no WDIOC_SETTIMEOUT
+        * and WDIOC_GETTIMEOUT always returns 256.
+        */
+       case WDIOC_GETTIMEOUT:
+               heartbeat = 256;
+               return put_user(heartbeat, p);
        default:
                return -ENOTTY;
        }
@@ -345,7 +345,7 @@ static int asr_release(struct inode *inode, struct file *file)
 
 static const struct file_operations asr_fops = {
        .owner =                THIS_MODULE,
-       .llseek =               no_llseek,
+       .llseek =               no_llseek,
        .write =                asr_write,
        .unlocked_ioctl =       asr_ioctl,
        .open =                 asr_open,