diff options
| author | Alan Cox <alan@redhat.com> | 2008-10-13 13:38:46 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-23 01:13:14 +0400 |
| commit | 0c17850047e2a9ec6913b3a71d6f91ec980dc07d (patch) | |
| tree | 4e04df8fb05bf1a8997aedb68ad608e58e4e80bc | |
| parent | 6cb603ed02a891b965dc2fc50a39bff131829a54 (diff) | |
| download | linux-0c17850047e2a9ec6913b3a71d6f91ec980dc07d.tar.xz | |
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>
| -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 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: |