aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/iop_wdt.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/watchdog/iop_wdt.c')
-rw-r--r--drivers/watchdog/iop_wdt.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/watchdog/iop_wdt.c b/drivers/watchdog/iop_wdt.c
index e54c888d2afe..e0d0a90ea10c 100644
--- a/drivers/watchdog/iop_wdt.c
+++ b/drivers/watchdog/iop_wdt.c
@@ -153,15 +153,6 @@ static long iop_wdt_ioctl(struct file *file,
153 ret = put_user(boot_status, argp); 153 ret = put_user(boot_status, argp);
154 break; 154 break;
155 155
156 case WDIOC_GETTIMEOUT:
157 ret = put_user(iop_watchdog_timeout(), argp);
158 break;
159
160 case WDIOC_KEEPALIVE:
161 wdt_enable();
162 ret = 0;
163 break;
164
165 case WDIOC_SETOPTIONS: 156 case WDIOC_SETOPTIONS:
166 if (get_user(options, (int *)arg)) 157 if (get_user(options, (int *)arg))
167 return -EFAULT; 158 return -EFAULT;
@@ -181,6 +172,15 @@ static long iop_wdt_ioctl(struct file *file,
181 ret = 0; 172 ret = 0;
182 } 173 }
183 break; 174 break;
175
176 case WDIOC_KEEPALIVE:
177 wdt_enable();
178 ret = 0;
179 break;
180
181 case WDIOC_GETTIMEOUT:
182 ret = put_user(iop_watchdog_timeout(), argp);
183 break;
184 } 184 }
185 return ret; 185 return ret;
186} 186}