aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/tty_ioctl.c
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-07-17 12:05:40 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-17 12:10:55 -0400
commit9833facf90c625f9757295bda6d970f82132b7be (patch)
treefa9d7ddd18e70757121f2371989111e348570651 /drivers/tty/tty_ioctl.c
parent6a6c8b362be31fd9c1caa776313e0725dbed1cf9 (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>
Diffstat (limited to 'drivers/tty/tty_ioctl.c')
-rw-r--r--drivers/tty/tty_ioctl.c24
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)
738 738
739static void set_sgflags(struct ktermios *termios, int flags) 739static void set_sgflags(struct ktermios *termios, int flags)
740{ 740{
741 termios.c_iflag = ICRNL | IXON; 741 termios->c_iflag = ICRNL | IXON;
742 termios.c_oflag = 0; 742 termios->c_oflag = 0;
743 termios.c_lflag = ISIG | ICANON; 743 termios->c_lflag = ISIG | ICANON;
744 if (flags & 0x02) { /* cbreak */ 744 if (flags & 0x02) { /* cbreak */
745 termios.c_iflag = 0; 745 termios->c_iflag = 0;
746 termios.c_lflag &= ~ICANON; 746 termios->c_lflag &= ~ICANON;
747 } 747 }
748 if (flags & 0x08) { /* echo */ 748 if (flags & 0x08) { /* echo */
749 termios.c_lflag |= ECHO | ECHOE | ECHOK | 749 termios->c_lflag |= ECHO | ECHOE | ECHOK |
750 ECHOCTL | ECHOKE | IEXTEN; 750 ECHOCTL | ECHOKE | IEXTEN;
751 } 751 }
752 if (flags & 0x10) { /* crmod */ 752 if (flags & 0x10) { /* crmod */
753 termios.c_oflag |= OPOST | ONLCR; 753 termios->c_oflag |= OPOST | ONLCR;
754 } 754 }
755 if (flags & 0x20) { /* raw */ 755 if (flags & 0x20) { /* raw */
756 termios.c_iflag = 0; 756 termios->c_iflag = 0;
757 termios.c_lflag &= ~(ISIG | ICANON); 757 termios->c_lflag &= ~(ISIG | ICANON);
758 } 758 }
759 if (!(termios.c_lflag & ICANON)) { 759 if (!(termios->c_lflag & ICANON)) {
760 termios.c_cc[VMIN] = 1; 760 termios->c_cc[VMIN] = 1;
761 termios.c_cc[VTIME] = 0; 761 termios->c_cc[VTIME] = 0;
762 } 762 }
763} 763}
764 764