ide: Add tx4938ide driver (v2)

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

diff --git a/drivers/watchdog/alim1535_wdt.c b/drivers/watchdog/alim1535_wdt.c
index 88760cb5ec131aa65275db6f3abff46c842b0b08..2a7690ecf97d7b1385ef68edb89c8587f3b8faea 100644 (file)
--- a/drivers/watchdog/alim1535_wdt.c
+++ b/drivers/watchdog/alim1535_wdt.c
@@ -18,7 +18,6 @@
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/pci.h>
-
 #include <linux/uaccess.h>
 #include <linux/io.h>
 
@@ -154,7 +153,7 @@ static ssize_t ali_write(struct file *file, const char __user *data,
                           the magic character */
                        for (i = 0; i != len; i++) {
                                char c;
-                               if (get_user(c, data+i))
+                               if (get_user(c, data + i))
                                        return -EFAULT;
                                if (c == 'V')
                                        ali_expect_release = 42;
@@ -196,9 +195,6 @@ static long ali_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        case WDIOC_GETSTATUS:
        case WDIOC_GETBOOTSTATUS:
                return put_user(0, p);
-       case WDIOC_KEEPALIVE:
-               ali_keepalive();
-               return 0;
        case WDIOC_SETOPTIONS:
        {
                int new_options, retval = -EINVAL;
@@ -215,6 +211,9 @@ static long ali_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                }
                return retval;
        }
+       case WDIOC_KEEPALIVE:
+               ali_keepalive();
+               return 0;
        case WDIOC_SETTIMEOUT:
        {
                int new_timeout;