diff options
Diffstat (limited to 'drivers/watchdog/ks8695_wdt.c')
-rw-r--r-- | drivers/watchdog/ks8695_wdt.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c index 6d052b80aa20..f8566d5c62fe 100644 --- a/drivers/watchdog/ks8695_wdt.c +++ b/drivers/watchdog/ks8695_wdt.c | |||
@@ -161,23 +161,9 @@ static long ks8695_wdt_ioctl(struct file *file, unsigned int cmd, | |||
161 | int new_value; | 161 | int new_value; |
162 | 162 | ||
163 | switch (cmd) { | 163 | switch (cmd) { |
164 | case WDIOC_KEEPALIVE: | ||
165 | ks8695_wdt_reload(); /* pat the watchdog */ | ||
166 | return 0; | ||
167 | case WDIOC_GETSUPPORT: | 164 | case WDIOC_GETSUPPORT: |
168 | return copy_to_user(argp, &ks8695_wdt_info, | 165 | return copy_to_user(argp, &ks8695_wdt_info, |
169 | sizeof(ks8695_wdt_info)) ? -EFAULT : 0; | 166 | sizeof(ks8695_wdt_info)) ? -EFAULT : 0; |
170 | case WDIOC_SETTIMEOUT: | ||
171 | if (get_user(new_value, p)) | ||
172 | return -EFAULT; | ||
173 | if (ks8695_wdt_settimeout(new_value)) | ||
174 | return -EINVAL; | ||
175 | /* Enable new time value */ | ||
176 | ks8695_wdt_start(); | ||
177 | /* Return current value */ | ||
178 | return put_user(wdt_time, p); | ||
179 | case WDIOC_GETTIMEOUT: | ||
180 | return put_user(wdt_time, p); | ||
181 | case WDIOC_GETSTATUS: | 167 | case WDIOC_GETSTATUS: |
182 | case WDIOC_GETBOOTSTATUS: | 168 | case WDIOC_GETBOOTSTATUS: |
183 | return put_user(0, p); | 169 | return put_user(0, p); |
@@ -189,6 +175,20 @@ static long ks8695_wdt_ioctl(struct file *file, unsigned int cmd, | |||
189 | if (new_value & WDIOS_ENABLECARD) | 175 | if (new_value & WDIOS_ENABLECARD) |
190 | ks8695_wdt_start(); | 176 | ks8695_wdt_start(); |
191 | return 0; | 177 | return 0; |
178 | case WDIOC_KEEPALIVE: | ||
179 | ks8695_wdt_reload(); /* pat the watchdog */ | ||
180 | return 0; | ||
181 | case WDIOC_SETTIMEOUT: | ||
182 | if (get_user(new_value, p)) | ||
183 | return -EFAULT; | ||
184 | if (ks8695_wdt_settimeout(new_value)) | ||
185 | return -EINVAL; | ||
186 | /* Enable new time value */ | ||
187 | ks8695_wdt_start(); | ||
188 | /* Return current value */ | ||
189 | return put_user(wdt_time, p); | ||
190 | case WDIOC_GETTIMEOUT: | ||
191 | return put_user(wdt_time, p); | ||
192 | default: | 192 | default: |
193 | return -ENOTTY; | 193 | return -ENOTTY; |
194 | } | 194 | } |