diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-08-06 14:06:29 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-06 10:36:53 -0700 |
| commit | 8bc5fb6abb670fa9079cd1994f016a39f99698fe (patch) | |
| tree | a689a32d66827a02e174e3523419bcd19703c652 /drivers/char/viocons.c | |
| parent | 3a35c27ac68cea19c252e127ec61099648eb4870 (diff) | |
Remove bogons from the iSeries console
The iSeries driver calls into the n_tty ldisc code directly for some
bizarre reason. I previously tagged this with a query but this actually
does need fixing as n_tty methods when you have a different ldisc set are
not a good thing to call.
In n_tty mode this change should have no effect, the core tty layer has
always called the ldisc ioctl method *anyway* and will call the one for
the right ldisc.
Signed-off-by: Alan Cox <alan@redhat.com>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/viocons.c')
| -rw-r--r-- | drivers/char/viocons.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c index 65fb848e1cce..f48892ba12f5 100644 --- a/drivers/char/viocons.c +++ b/drivers/char/viocons.c @@ -705,10 +705,6 @@ static int viotty_ioctl(struct tty_struct *tty, struct file *file, case KDSKBLED: return 0; } - /* FIXME: WTF is this being called for ??? */ - lock_kernel(); - ret = n_tty_ioctl(tty, file, cmd, arg); - unlock_kernel(); return ret; } |