diff options
Diffstat (limited to 'drivers/watchdog/ar7_wdt.c')
-rw-r--r-- | drivers/watchdog/ar7_wdt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/watchdog/ar7_wdt.c b/drivers/watchdog/ar7_wdt.c index ef7b0d67095e..55dcbfe2bb72 100644 --- a/drivers/watchdog/ar7_wdt.c +++ b/drivers/watchdog/ar7_wdt.c | |||
@@ -213,7 +213,7 @@ static int ar7_wdt_notify_sys(struct notifier_block *this, | |||
213 | } | 213 | } |
214 | 214 | ||
215 | static struct notifier_block ar7_wdt_notifier = { | 215 | static struct notifier_block ar7_wdt_notifier = { |
216 | .notifier_call = ar7_wdt_notify_sys | 216 | .notifier_call = ar7_wdt_notify_sys, |
217 | }; | 217 | }; |
218 | 218 | ||
219 | static ssize_t ar7_wdt_write(struct file *file, const char *data, | 219 | static ssize_t ar7_wdt_write(struct file *file, const char *data, |
@@ -230,7 +230,7 @@ static ssize_t ar7_wdt_write(struct file *file, const char *data, | |||
230 | expect_close = 0; | 230 | expect_close = 0; |
231 | for (i = 0; i < len; ++i) { | 231 | for (i = 0; i < len; ++i) { |
232 | char c; | 232 | char c; |
233 | if (get_user(c, data+i)) | 233 | if (get_user(c, data + i)) |
234 | return -EFAULT; | 234 | return -EFAULT; |
235 | if (c == 'V') | 235 | if (c == 'V') |
236 | expect_close = 1; | 236 | expect_close = 1; |
@@ -251,8 +251,6 @@ static long ar7_wdt_ioctl(struct file *file, | |||
251 | int new_margin; | 251 | int new_margin; |
252 | 252 | ||
253 | switch (cmd) { | 253 | switch (cmd) { |
254 | default: | ||
255 | return -ENOTTY; | ||
256 | case WDIOC_GETSUPPORT: | 254 | case WDIOC_GETSUPPORT: |
257 | if (copy_to_user((struct watchdog_info *)arg, &ident, | 255 | if (copy_to_user((struct watchdog_info *)arg, &ident, |
258 | sizeof(ident))) | 256 | sizeof(ident))) |
@@ -281,6 +279,8 @@ static long ar7_wdt_ioctl(struct file *file, | |||
281 | if (put_user(margin, (int *)arg)) | 279 | if (put_user(margin, (int *)arg)) |
282 | return -EFAULT; | 280 | return -EFAULT; |
283 | return 0; | 281 | return 0; |
282 | default: | ||
283 | return -ENOTTY; | ||
284 | } | 284 | } |
285 | } | 285 | } |
286 | 286 | ||