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>

diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c
index 65fb848e1cce0492d908b8dad5f980b6146c05cb..f48892ba12f58ad918106485c6a79d3d1ad467a9 100644 (file)
--- 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;
 }