From a853ff21fddab897ac4733aeab2d7cf4c9e6b25d Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 26 Aug 2008 19:52:47 +0100 Subject: [PATCH] --- yaml --- r: 109219 b: refs/heads/master c: f753f3272b4d2108d1e4b121ddcde504737a8693 h: refs/heads/master i: 109217: 761eeaa0430252c74378fcf95e4114aa7ff08c70 109215: 196170da2666a8707326d43b0d9f24338204ea3d v: v3 --- [refs] | 2 +- trunk/drivers/char/tty_ioctl.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 21315894b1c9..7b4838a97d7d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 325a9a3d3990e77c62b771a71239fcd0cb6f6e2c +refs/heads/master: f753f3272b4d2108d1e4b121ddcde504737a8693 diff --git a/trunk/drivers/char/tty_ioctl.c b/trunk/drivers/char/tty_ioctl.c index ea9fc5d03b99..bf34e4597421 100644 --- a/trunk/drivers/char/tty_ioctl.c +++ b/trunk/drivers/char/tty_ioctl.c @@ -937,12 +937,14 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file, return 0; #endif case TIOCGSOFTCAR: - return put_user(C_CLOCAL(tty) ? 1 : 0, + /* FIXME: for correctness we may need to take the termios + lock here - review */ + return put_user(C_CLOCAL(real_tty) ? 1 : 0, (int __user *)arg); case TIOCSSOFTCAR: if (get_user(arg, (unsigned int __user *) arg)) return -EFAULT; - return tty_change_softcar(tty, arg); + return tty_change_softcar(real_tty, arg); default: return -ENOIOCTLCMD; }