summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2008-08-06 15:06:29 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-06 19:36:53 +0200
commit8bc5fb6abb670fa9079cd1994f016a39f99698fe (patch)
treea689a32d66827a02e174e3523419bcd19703c652 /drivers/char
parentdocbook: fix v4l fatal filename error (diff)
downloadlinux-8bc5fb6abb670fa9079cd1994f016a39f99698fe.tar.xz
linux-8bc5fb6abb670fa9079cd1994f016a39f99698fe.zip
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')
-rw-r--r--drivers/char/viocons.c4
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;
}