diff options
Diffstat (limited to 'drivers/watchdog/w83977f_wdt.c')
-rw-r--r-- | drivers/watchdog/w83977f_wdt.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/watchdog/w83977f_wdt.c b/drivers/watchdog/w83977f_wdt.c index 6860a13f5bb9..2525da5080ca 100644 --- 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) | |||
390 | uarg.i = (int __user *)arg; | 390 | uarg.i = (int __user *)arg; |
391 | 391 | ||
392 | switch (cmd) { | 392 | switch (cmd) { |
393 | default: | ||
394 | return -ENOTTY; | ||
395 | |||
396 | case WDIOC_GETSUPPORT: | 393 | case WDIOC_GETSUPPORT: |
397 | return copy_to_user(uarg.ident, &ident, | 394 | return copy_to_user(uarg.ident, &ident, |
398 | sizeof(ident)) ? -EFAULT : 0; | 395 | sizeof(ident)) ? -EFAULT : 0; |
@@ -404,10 +401,6 @@ static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
404 | case WDIOC_GETBOOTSTATUS: | 401 | case WDIOC_GETBOOTSTATUS: |
405 | return put_user(0, uarg.i); | 402 | return put_user(0, uarg.i); |
406 | 403 | ||
407 | case WDIOC_KEEPALIVE: | ||
408 | wdt_keepalive(); | ||
409 | return 0; | ||
410 | |||
411 | case WDIOC_SETOPTIONS: | 404 | case WDIOC_SETOPTIONS: |
412 | if (get_user(new_options, uarg.i)) | 405 | if (get_user(new_options, uarg.i)) |
413 | return -EFAULT; | 406 | return -EFAULT; |
@@ -424,6 +417,10 @@ static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
424 | 417 | ||
425 | return retval; | 418 | return retval; |
426 | 419 | ||
420 | case WDIOC_KEEPALIVE: | ||
421 | wdt_keepalive(); | ||
422 | return 0; | ||
423 | |||
427 | case WDIOC_SETTIMEOUT: | 424 | case WDIOC_SETTIMEOUT: |
428 | if (get_user(new_timeout, uarg.i)) | 425 | if (get_user(new_timeout, uarg.i)) |
429 | return -EFAULT; | 426 | return -EFAULT; |
@@ -437,6 +434,9 @@ static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
437 | case WDIOC_GETTIMEOUT: | 434 | case WDIOC_GETTIMEOUT: |
438 | return put_user(timeout, uarg.i); | 435 | return put_user(timeout, uarg.i); |
439 | 436 | ||
437 | default: | ||
438 | return -ENOTTY; | ||
439 | |||
440 | } | 440 | } |
441 | } | 441 | } |
442 | 442 | ||