diff options
Diffstat (limited to 'drivers/watchdog/sc520_wdt.c')
-rw-r--r-- | drivers/watchdog/sc520_wdt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/watchdog/sc520_wdt.c b/drivers/watchdog/sc520_wdt.c index 1d5ba15dec63..a2b6c1067ec5 100644 --- a/drivers/watchdog/sc520_wdt.c +++ b/drivers/watchdog/sc520_wdt.c | |||
@@ -291,16 +291,11 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
291 | }; | 291 | }; |
292 | 292 | ||
293 | switch (cmd) { | 293 | switch (cmd) { |
294 | default: | ||
295 | return -ENOTTY; | ||
296 | case WDIOC_GETSUPPORT: | 294 | case WDIOC_GETSUPPORT: |
297 | return copy_to_user(argp, &ident, sizeof(ident)) ? -EFAULT : 0; | 295 | return copy_to_user(argp, &ident, sizeof(ident)) ? -EFAULT : 0; |
298 | case WDIOC_GETSTATUS: | 296 | case WDIOC_GETSTATUS: |
299 | case WDIOC_GETBOOTSTATUS: | 297 | case WDIOC_GETBOOTSTATUS: |
300 | return put_user(0, p); | 298 | return put_user(0, p); |
301 | case WDIOC_KEEPALIVE: | ||
302 | wdt_keepalive(); | ||
303 | return 0; | ||
304 | case WDIOC_SETOPTIONS: | 299 | case WDIOC_SETOPTIONS: |
305 | { | 300 | { |
306 | int new_options, retval = -EINVAL; | 301 | int new_options, retval = -EINVAL; |
@@ -320,6 +315,9 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
320 | 315 | ||
321 | return retval; | 316 | return retval; |
322 | } | 317 | } |
318 | case WDIOC_KEEPALIVE: | ||
319 | wdt_keepalive(); | ||
320 | return 0; | ||
323 | case WDIOC_SETTIMEOUT: | 321 | case WDIOC_SETTIMEOUT: |
324 | { | 322 | { |
325 | int new_timeout; | 323 | int new_timeout; |
@@ -335,6 +333,8 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
335 | } | 333 | } |
336 | case WDIOC_GETTIMEOUT: | 334 | case WDIOC_GETTIMEOUT: |
337 | return put_user(timeout, p); | 335 | return put_user(timeout, p); |
336 | default: | ||
337 | return -ENOTTY; | ||
338 | } | 338 | } |
339 | } | 339 | } |
340 | 340 | ||