Skip to content

Commit

Permalink
tty: Fix up PPC fallout from the termios move
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Jul 17, 2012
1 parent 6a6c8b3 commit 9833fac
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions drivers/tty/tty_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down

0 comments on commit 9833fac

Please sign in to comment.