qlge: Add ethtool wake on LAN function.

[safe/jmp/linux-2.6] / drivers / watchdog / w83977f_wdt.c

diff --git a/drivers/watchdog/w83977f_wdt.c b/drivers/watchdog/w83977f_wdt.c
index 6860a13..0560182 100644 (file)
--- a/drivers/watchdog/w83977f_wdt.c
+++ b/drivers/watchdog/w83977f_wdt.c
@@ -390,9 +390,6 @@ static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        uarg.i = (int __user *)arg;
 
        switch (cmd) {
-       default:
-               return -ENOTTY;
-
        case WDIOC_GETSUPPORT:
                return copy_to_user(uarg.ident, &ident,
                                                sizeof(ident)) ? -EFAULT : 0;
@@ -404,10 +401,6 @@ static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        case WDIOC_GETBOOTSTATUS:
                return put_user(0, uarg.i);
 
-       case WDIOC_KEEPALIVE:
-               wdt_keepalive();
-               return 0;
-
        case WDIOC_SETOPTIONS:
                if (get_user(new_options, uarg.i))
                        return -EFAULT;
@@ -424,12 +417,16 @@ static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
                return retval;
 
+       case WDIOC_KEEPALIVE:
+               wdt_keepalive();
+               return 0;
+
        case WDIOC_SETTIMEOUT:
                if (get_user(new_timeout, uarg.i))
                        return -EFAULT;
 
                if (wdt_set_timeout(new_timeout))
-                   return -EINVAL;
+                       return -EINVAL;
 
                wdt_keepalive();
                /* Fall */
@@ -437,6 +434,9 @@ static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        case WDIOC_GETTIMEOUT:
                return put_user(timeout, uarg.i);
 
+       default:
+               return -ENOTTY;
+
        }
 }