diff options
| author | Alan Cox <alan@redhat.com> | 2008-10-13 10:38:46 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-18 10:49:11 -0700 |
| commit | 074555fe0e36c1bde7795e8f3f7350d228b9dd1c (patch) | |
| tree | 805e1a08935b76357a6502c1326b369b1212ce61 /drivers/char | |
| parent | 769b0455c1ec257b9e5067129accab1a6052de4c (diff) | |
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>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/tty_io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index e4dce870954..0232485ddad 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c @@ -2996,7 +2996,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: |