diff options
| author | Alan Cox <alan@redhat.com> | 2008-10-13 10:38:46 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-22 14:05:13 -0700 |
| commit | 5ef490acaa53671f9d4f05ff276201bdb4cbc5a6 (patch) | |
| tree | d4732ff7225ff3abc6ab5f5d9c99469a345e5c2f | |
| parent | 3762d1c86c1e862603f4c86cbd962475b5747865 (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>
| -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 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: |