diff options
Diffstat (limited to 'drivers/watchdog/acquirewdt.c')
-rw-r--r-- | drivers/watchdog/acquirewdt.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c index 340d1eeec16..7a5c69421f1 100644 --- a/drivers/watchdog/acquirewdt.c +++ b/drivers/watchdog/acquirewdt.c | |||
@@ -164,13 +164,6 @@ static long acq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
164 | case WDIOC_GETBOOTSTATUS: | 164 | case WDIOC_GETBOOTSTATUS: |
165 | return put_user(0, p); | 165 | return put_user(0, p); |
166 | 166 | ||
167 | case WDIOC_KEEPALIVE: | ||
168 | acq_keepalive(); | ||
169 | return 0; | ||
170 | |||
171 | case WDIOC_GETTIMEOUT: | ||
172 | return put_user(WATCHDOG_HEARTBEAT, p); | ||
173 | |||
174 | case WDIOC_SETOPTIONS: | 167 | case WDIOC_SETOPTIONS: |
175 | { | 168 | { |
176 | if (get_user(options, p)) | 169 | if (get_user(options, p)) |
@@ -185,6 +178,13 @@ static long acq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
185 | } | 178 | } |
186 | return retval; | 179 | return retval; |
187 | } | 180 | } |
181 | case WDIOC_KEEPALIVE: | ||
182 | acq_keepalive(); | ||
183 | return 0; | ||
184 | |||
185 | case WDIOC_GETTIMEOUT: | ||
186 | return put_user(WATCHDOG_HEARTBEAT, p); | ||
187 | |||
188 | default: | 188 | default: |
189 | return -ENOTTY; | 189 | return -ENOTTY; |
190 | } | 190 | } |