summaryrefslogtreecommitdiffstats
path: root/drivers/char/tty_io.c
diff options
context:
space:
mode:
authorAlan Cox <alan@redhat.com>2008-10-13 11:38:46 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-13 18:51:41 +0200
commit8f520021837d45c47d0ab57e7271f8d88bf7f3a4 (patch)
tree4435f3141163480c23f7274c502d58e3cd9cb963 /drivers/char/tty_io.c
parenttty: Add termiox (diff)
downloadlinux-8f520021837d45c47d0ab57e7271f8d88bf7f3a4.tar.xz
linux-8f520021837d45c47d0ab57e7271f8d88bf7f3a4.zip
tty: Termios locking - sort out real_tty confusions and lock reads
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>
Diffstat (limited to '')
-rw-r--r--drivers/char/tty_io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index fa162c93ee02..ac53d7f9b5d4 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -2605,7 +2605,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: