Merge git://git.infradead.org/mtd-2.6

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

diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c
index bb3c75eed9df765d8759d62be86f18e0b7aebb94..7204f9662114f01f976fb7396f190f449c9d4f3c 100644 (file)
--- a/drivers/watchdog/softdog.c
+++ b/drivers/watchdog/softdog.c
@@ -1,8 +1,7 @@
 /*
  *     SoftDog 0.07:   A Software Watchdog Device
  *
- *     (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                             http://www.redhat.com
+ *     (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>, All Rights Reserved.
  *
  *     This program is free software; you can redistribute it and/or
  *     modify it under the terms of the GNU General Public License
@@ -206,8 +205,6 @@ static long softdog_ioctl(struct file *file, unsigned int cmd,
                .identity =             "Software Watchdog",
        };
        switch (cmd) {
-       default:
-               return -ENOTTY;
        case WDIOC_GETSUPPORT:
                return copy_to_user(argp, &ident, sizeof(ident)) ? -EFAULT : 0;
        case WDIOC_GETSTATUS:
@@ -225,6 +222,8 @@ static long softdog_ioctl(struct file *file, unsigned int cmd,
                /* Fall */
        case WDIOC_GETTIMEOUT:
                return put_user(soft_margin, p);
+       default:
+               return -ENOTTY;
        }
 }