diff options
author | Alan Cox <alan@redhat.com> | 2008-10-13 05:36:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 12:51:40 -0400 |
commit | e6885107736a4dd23e7d3bc103fe6d043c63c4de (patch) | |
tree | 77454a1a03bd0021945e3e6ef08b6f39ef8dbf14 /drivers/char/vt.c | |
parent | b70ac7718579b5cbf3bdd74fd01132d1c91596f4 (diff) |
tty: move tioclinux from a special case
Right now we have ifdefs and hooks in the core ioctl handler for TIOCLINUX
and then test if its a console. This is brain dead. Instead call the
tioclinux helper from the relevant driver ioctl methods.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/vt.c')
-rw-r--r-- | drivers/char/vt.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index 60359c360912..05ca1c5dcb1c 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c | |||
@@ -2583,8 +2583,6 @@ int tioclinux(struct tty_struct *tty, unsigned long arg) | |||
2583 | int lines; | 2583 | int lines; |
2584 | int ret; | 2584 | int ret; |
2585 | 2585 | ||
2586 | if (tty->driver->type != TTY_DRIVER_TYPE_CONSOLE) | ||
2587 | return -EINVAL; | ||
2588 | if (current->signal->tty != tty && !capable(CAP_SYS_ADMIN)) | 2586 | if (current->signal->tty != tty && !capable(CAP_SYS_ADMIN)) |
2589 | return -EPERM; | 2587 | return -EPERM; |
2590 | if (get_user(type, p)) | 2588 | if (get_user(type, p)) |