From: Alan Cox <alan@redhat.com>
Date: Mon, 13 Oct 2008 09:38:46 +0000 (+0100)
Subject: tty: Termios locking - sort out real_tty confusions and lock reads
X-Git-Tag: v2.6.26.7~24
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0c17850047e2a9ec6913b3a71d6f91ec980dc07d;p=karo-tx-linux.git

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 <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 750131010af0..a51374e5cfda 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -3474,7 +3474,7 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 	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: