Merge branch 'linus' into test

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

diff --git a/drivers/watchdog/wdt.c b/drivers/watchdog/wdt.c
index 53a6b18bcb9ad8275f43454ce1cdde856e9bb6b8..deeebb2b13ead3f1c3af305e5978599dd6a3f2e8 100644 (file)
--- a/drivers/watchdog/wdt.c
+++ b/drivers/watchdog/wdt.c
@@ -373,8 +373,6 @@ static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 #endif /* CONFIG_WDT_501 */
 
        switch (cmd) {
-       default:
-               return -ENOTTY;
        case WDIOC_GETSUPPORT:
                return copy_to_user(argp, &ident, sizeof(ident)) ? -EFAULT : 0;
        case WDIOC_GETSTATUS:
@@ -394,6 +392,8 @@ static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                /* Fall */
        case WDIOC_GETTIMEOUT:
                return put_user(heartbeat, p);
+       default:
+               return -ENOTTY;
        }
 }