diff options
Diffstat (limited to 'drivers/usb/serial/mos7840.c')
-rw-r--r-- | drivers/usb/serial/mos7840.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index 2f6da1e89bfa..402c32d7accb 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c | |||
@@ -1651,7 +1651,7 @@ static void mos7840_throttle(struct tty_struct *tty) | |||
1651 | return; | 1651 | return; |
1652 | } | 1652 | } |
1653 | /* if we are implementing RTS/CTS, toggle that line */ | 1653 | /* if we are implementing RTS/CTS, toggle that line */ |
1654 | if (tty->termios->c_cflag & CRTSCTS) { | 1654 | if (tty->termios.c_cflag & CRTSCTS) { |
1655 | mos7840_port->shadowMCR &= ~MCR_RTS; | 1655 | mos7840_port->shadowMCR &= ~MCR_RTS; |
1656 | status = mos7840_set_uart_reg(port, MODEM_CONTROL_REGISTER, | 1656 | status = mos7840_set_uart_reg(port, MODEM_CONTROL_REGISTER, |
1657 | mos7840_port->shadowMCR); | 1657 | mos7840_port->shadowMCR); |
@@ -1694,7 +1694,7 @@ static void mos7840_unthrottle(struct tty_struct *tty) | |||
1694 | } | 1694 | } |
1695 | 1695 | ||
1696 | /* if we are implementing RTS/CTS, toggle that line */ | 1696 | /* if we are implementing RTS/CTS, toggle that line */ |
1697 | if (tty->termios->c_cflag & CRTSCTS) { | 1697 | if (tty->termios.c_cflag & CRTSCTS) { |
1698 | mos7840_port->shadowMCR |= MCR_RTS; | 1698 | mos7840_port->shadowMCR |= MCR_RTS; |
1699 | status = mos7840_set_uart_reg(port, MODEM_CONTROL_REGISTER, | 1699 | status = mos7840_set_uart_reg(port, MODEM_CONTROL_REGISTER, |
1700 | mos7840_port->shadowMCR); | 1700 | mos7840_port->shadowMCR); |
@@ -2000,8 +2000,8 @@ static void mos7840_change_port_settings(struct tty_struct *tty, | |||
2000 | lStop = LCR_STOP_1; | 2000 | lStop = LCR_STOP_1; |
2001 | lParity = LCR_PAR_NONE; | 2001 | lParity = LCR_PAR_NONE; |
2002 | 2002 | ||
2003 | cflag = tty->termios->c_cflag; | 2003 | cflag = tty->termios.c_cflag; |
2004 | iflag = tty->termios->c_iflag; | 2004 | iflag = tty->termios.c_iflag; |
2005 | 2005 | ||
2006 | /* Change the number of bits */ | 2006 | /* Change the number of bits */ |
2007 | if (cflag & CSIZE) { | 2007 | if (cflag & CSIZE) { |
@@ -2161,10 +2161,10 @@ static void mos7840_set_termios(struct tty_struct *tty, | |||
2161 | 2161 | ||
2162 | dbg("%s", "setting termios - "); | 2162 | dbg("%s", "setting termios - "); |
2163 | 2163 | ||
2164 | cflag = tty->termios->c_cflag; | 2164 | cflag = tty->termios.c_cflag; |
2165 | 2165 | ||
2166 | dbg("%s - clfag %08x iflag %08x", __func__, | 2166 | dbg("%s - clfag %08x iflag %08x", __func__, |
2167 | tty->termios->c_cflag, RELEVANT_IFLAG(tty->termios->c_iflag)); | 2167 | tty->termios.c_cflag, RELEVANT_IFLAG(tty->termios.c_iflag)); |
2168 | dbg("%s - old clfag %08x old iflag %08x", __func__, | 2168 | dbg("%s - old clfag %08x old iflag %08x", __func__, |
2169 | old_termios->c_cflag, RELEVANT_IFLAG(old_termios->c_iflag)); | 2169 | old_termios->c_cflag, RELEVANT_IFLAG(old_termios->c_iflag)); |
2170 | dbg("%s - port %d", __func__, port->number); | 2170 | dbg("%s - port %d", __func__, port->number); |