From 5ef490acaa53671f9d4f05ff276201bdb4cbc5a6 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 13 Oct 2008 10:38:46 +0100 Subject: tty: Termios locking - sort out real_tty confusions and lock reads commit 8f520021837d45c47d0ab57e7271f8d88bf7f3a4 upstream (only the tty_io.c portion of this commit) This moves us towards sanity and should mean our termios locking is now complete and comprehensive. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- drivers/char/tty_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index 613ec816ce60..31143e9bf0bb 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c @@ -3373,7 +3373,7 @@ int tty_ioctl(struct inode *inode, struct file *file, case TIOCSTI: return tiocsti(tty, p); case TIOCGWINSZ: - return tiocgwinsz(tty, p); + return tiocgwinsz(real_tty, p); case TIOCSWINSZ: return tiocswinsz(tty, real_tty, p); case TIOCCONS: -- cgit v1.2.3