diff options
| author | Alan Cox <alan@linux.intel.com> | 2012-07-17 17:05:40 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-17 09:10:55 -0700 |
| commit | 9833facf90c625f9757295bda6d970f82132b7be (patch) | |
| tree | fa9d7ddd18e70757121f2371989111e348570651 | |
| parent | 6a6c8b362be31fd9c1caa776313e0725dbed1cf9 (diff) | |
tty: Fix up PPC fallout from the termios move
This fixes up the problem Stephen Rothwell reported when trying to merge -next
Signed-off-by: Alan Cox <alan@linux.intel.com>
Reported-by: Stephen Rothwell <sfr@cab.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/tty_ioctl.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c index d3c2bda1e461..12b1fa0f4f86 100644 --- a/drivers/tty/tty_ioctl.c +++ b/drivers/tty/tty_ioctl.c @@ -738,27 +738,27 @@ static int get_sgttyb(struct tty_struct *tty, struct sgttyb __user *sgttyb) static void set_sgflags(struct ktermios *termios, int flags) { - termios.c_iflag = ICRNL | IXON; - termios.c_oflag = 0; - termios.c_lflag = ISIG | ICANON; + termios->c_iflag = ICRNL | IXON; + termios->c_oflag = 0; + termios->c_lflag = ISIG | ICANON; if (flags & 0x02) { /* cbreak */ - termios.c_iflag = 0; - termios.c_lflag &= ~ICANON; + termios->c_iflag = 0; + termios->c_lflag &= ~ICANON; } if (flags & 0x08) { /* echo */ - termios.c_lflag |= ECHO | ECHOE | ECHOK | + termios->c_lflag |= ECHO | ECHOE | ECHOK | ECHOCTL | ECHOKE | IEXTEN; } if (flags & 0x10) { /* crmod */ - termios.c_oflag |= OPOST | ONLCR; + termios->c_oflag |= OPOST | ONLCR; } if (flags & 0x20) { /* raw */ - termios.c_iflag = 0; - termios.c_lflag &= ~(ISIG | ICANON); + termios->c_iflag = 0; + termios->c_lflag &= ~(ISIG | ICANON); } - if (!(termios.c_lflag & ICANON)) { - termios.c_cc[VMIN] = 1; - termios.c_cc[VTIME] = 0; + if (!(termios->c_lflag & ICANON)) { + termios->c_cc[VMIN] = 1; + termios->c_cc[VTIME] = 0; } } |