Commit 8bc5fb6a authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

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: default avatarAlan Cox <alan@redhat.com>
Acked-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3a35c27a
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
@@ -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;
}