diff options
Diffstat (limited to 'drivers/watchdog/ibmasr.c')
-rw-r--r-- | drivers/watchdog/ibmasr.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/watchdog/ibmasr.c b/drivers/watchdog/ibmasr.c index 6824bf80b37e..0b549f3ff915 100644 --- a/drivers/watchdog/ibmasr.c +++ b/drivers/watchdog/ibmasr.c | |||
@@ -287,16 +287,6 @@ static long asr_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
287 | case WDIOC_GETSTATUS: | 287 | case WDIOC_GETSTATUS: |
288 | case WDIOC_GETBOOTSTATUS: | 288 | case WDIOC_GETBOOTSTATUS: |
289 | return put_user(0, p); | 289 | return put_user(0, p); |
290 | case WDIOC_KEEPALIVE: | ||
291 | asr_toggle(); | ||
292 | return 0; | ||
293 | /* | ||
294 | * The hardware has a fixed timeout value, so no WDIOC_SETTIMEOUT | ||
295 | * and WDIOC_GETTIMEOUT always returns 256. | ||
296 | */ | ||
297 | case WDIOC_GETTIMEOUT: | ||
298 | heartbeat = 256; | ||
299 | return put_user(heartbeat, p); | ||
300 | case WDIOC_SETOPTIONS: | 290 | case WDIOC_SETOPTIONS: |
301 | { | 291 | { |
302 | int new_options, retval = -EINVAL; | 292 | int new_options, retval = -EINVAL; |
@@ -313,6 +303,16 @@ static long asr_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
313 | } | 303 | } |
314 | return retval; | 304 | return retval; |
315 | } | 305 | } |
306 | case WDIOC_KEEPALIVE: | ||
307 | asr_toggle(); | ||
308 | return 0; | ||
309 | /* | ||
310 | * The hardware has a fixed timeout value, so no WDIOC_SETTIMEOUT | ||
311 | * and WDIOC_GETTIMEOUT always returns 256. | ||
312 | */ | ||
313 | case WDIOC_GETTIMEOUT: | ||
314 | heartbeat = 256; | ||
315 | return put_user(heartbeat, p); | ||
316 | default: | 316 | default: |
317 | return -ENOTTY; | 317 | return -ENOTTY; |
318 | } | 318 | } |