diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
| commit | f0eef25339f92f7cd4aeea23d9ae97987a5a1e82 (patch) | |
| tree | 2472e94d39f43a9580a6d2d5d92de0b749023263 /drivers/char/watchdog/softdog.c | |
| parent | 0cfea5dd98205f2fa318836da664a7d7df1afbc1 (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Diffstat (limited to 'drivers/char/watchdog/softdog.c')
| -rw-r--r-- | drivers/char/watchdog/softdog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/softdog.c b/drivers/char/watchdog/softdog.c index ef8da517545a..4067e1f8a368 100644 --- a/drivers/char/watchdog/softdog.c +++ b/drivers/char/watchdog/softdog.c | |||
| @@ -203,7 +203,7 @@ static int softdog_ioctl(struct inode *inode, struct file *file, | |||
| 203 | }; | 203 | }; |
| 204 | switch (cmd) { | 204 | switch (cmd) { |
| 205 | default: | 205 | default: |
| 206 | return -ENOIOCTLCMD; | 206 | return -ENOTTY; |
| 207 | case WDIOC_GETSUPPORT: | 207 | case WDIOC_GETSUPPORT: |
| 208 | return copy_to_user(argp, &ident, | 208 | return copy_to_user(argp, &ident, |
| 209 | sizeof(ident)) ? -EFAULT : 0; | 209 | sizeof(ident)) ? -EFAULT : 0; |