aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/mos7840.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/serial/mos7840.c')
-rw-r--r--drivers/usb/serial/mos7840.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 57eca2448424..d2f2b5d65732 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -1649,7 +1649,7 @@ static void mos7840_throttle(struct tty_struct *tty)
1649 return; 1649 return;
1650 } 1650 }
1651 /* if we are implementing RTS/CTS, toggle that line */ 1651 /* if we are implementing RTS/CTS, toggle that line */
1652 if (tty->termios->c_cflag & CRTSCTS) { 1652 if (tty->termios.c_cflag & CRTSCTS) {
1653 mos7840_port->shadowMCR &= ~MCR_RTS; 1653 mos7840_port->shadowMCR &= ~MCR_RTS;
1654 status = mos7840_set_uart_reg(port, MODEM_CONTROL_REGISTER, 1654 status = mos7840_set_uart_reg(port, MODEM_CONTROL_REGISTER,
1655 mos7840_port->shadowMCR); 1655 mos7840_port->shadowMCR);
@@ -1692,7 +1692,7 @@ static void mos7840_unthrottle(struct tty_struct *tty)
1692 } 1692 }
1693 1693
1694 /* if we are implementing RTS/CTS, toggle that line */ 1694 /* if we are implementing RTS/CTS, toggle that line */
1695 if (tty->termios->c_cflag & CRTSCTS) { 1695 if (tty->termios.c_cflag & CRTSCTS) {
1696 mos7840_port->shadowMCR |= MCR_RTS; 1696 mos7840_port->shadowMCR |= MCR_RTS;
1697 status = mos7840_set_uart_reg(port, MODEM_CONTROL_REGISTER, 1697 status = mos7840_set_uart_reg(port, MODEM_CONTROL_REGISTER,
1698 mos7840_port->shadowMCR); 1698 mos7840_port->shadowMCR);
@@ -1998,8 +1998,8 @@ static void mos7840_change_port_settings(struct tty_struct *tty,
1998 lStop = LCR_STOP_1; 1998 lStop = LCR_STOP_1;
1999 lParity = LCR_PAR_NONE; 1999 lParity = LCR_PAR_NONE;
2000 2000
2001 cflag = tty->termios->c_cflag; 2001 cflag = tty->termios.c_cflag;
2002 iflag = tty->termios->c_iflag; 2002 iflag = tty->termios.c_iflag;
2003 2003
2004 /* Change the number of bits */ 2004 /* Change the number of bits */
2005 if (cflag & CSIZE) { 2005 if (cflag & CSIZE) {
@@ -2159,10 +2159,10 @@ static void mos7840_set_termios(struct tty_struct *tty,
2159 2159
2160 dbg("%s", "setting termios - "); 2160 dbg("%s", "setting termios - ");
2161 2161
2162 cflag = tty->termios->c_cflag; 2162 cflag = tty->termios.c_cflag;
2163 2163
2164 dbg("%s - clfag %08x iflag %08x", __func__, 2164 dbg("%s - clfag %08x iflag %08x", __func__,
2165 tty->termios->c_cflag, RELEVANT_IFLAG(tty->termios->c_iflag)); 2165 tty->termios.c_cflag, RELEVANT_IFLAG(tty->termios.c_iflag));
2166 dbg("%s - old clfag %08x old iflag %08x", __func__, 2166 dbg("%s - old clfag %08x old iflag %08x", __func__,
2167 old_termios->c_cflag, RELEVANT_IFLAG(old_termios->c_iflag)); 2167 old_termios->c_cflag, RELEVANT_IFLAG(old_termios->c_iflag));
2168 dbg("%s - port %d", __func__, port->number); 2168 dbg("%s - port %d", __func__, port->number);