Merge Linus' latest into master

Conflicts:

	drivers/watchdog/at91rm9200_wdt.c
	drivers/watchdog/davinci_wdt.c
	drivers/watchdog/ep93xx_wdt.c
	drivers/watchdog/ixp2000_wdt.c
	drivers/watchdog/ixp4xx_wdt.c
	drivers/watchdog/ks8695_wdt.c
	drivers/watchdog/omap_wdt.c
	drivers/watchdog/pnx4008_wdt.c
	drivers/watchdog/sa1100_wdt.c
	drivers/watchdog/wdt285.c

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/watchdog/it8712f_wdt.c b/drivers/watchdog/it8712f_wdt.c
index 51bfd5721833..2270ee07c01b 100644
--- a/drivers/watchdog/it8712f_wdt.c
+++ b/drivers/watchdog/it8712f_wdt.c
@@ -221,7 +221,7 @@ static ssize_t it8712f_wdt_write(struct file *file, const char __user *data,
                 expect_close = 0;
                 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')
                                 expect_close = 42;
@@ -244,8 +244,6 @@ static long it8712f_wdt_ioctl(struct file *file, unsigned int cmd,
         int value;
 
         switch (cmd) {
-        default:
-                return -ENOTTY;
         case WDIOC_GETSUPPORT:
                 if (copy_to_user(argp, &ident, sizeof(ident)))
                         return -EFAULT;
@@ -284,6 +282,8 @@ static long it8712f_wdt_ioctl(struct file *file, unsigned int cmd,
                 if (put_user(margin, p))
                         return -EFAULT;
                 return 0;
+        default:
+                return -ENOTTY;
         }
 }