diff options
Diffstat (limited to 'drivers/serial/jsm/jsm_tty.c')
-rw-r--r-- | drivers/serial/jsm/jsm_tty.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/serial/jsm/jsm_tty.c index 94ec66372508..a697914ae3d0 100644 --- a/drivers/serial/jsm/jsm_tty.c +++ b/drivers/serial/jsm/jsm_tty.c | |||
@@ -145,7 +145,7 @@ static void jsm_tty_send_xchar(struct uart_port *port, char ch) | |||
145 | struct ktermios *termios; | 145 | struct ktermios *termios; |
146 | 146 | ||
147 | spin_lock_irqsave(&port->lock, lock_flags); | 147 | spin_lock_irqsave(&port->lock, lock_flags); |
148 | termios = port->info->tty->termios; | 148 | termios = port->info->port.tty->termios; |
149 | if (ch == termios->c_cc[VSTART]) | 149 | if (ch == termios->c_cc[VSTART]) |
150 | channel->ch_bd->bd_ops->send_start_character(channel); | 150 | channel->ch_bd->bd_ops->send_start_character(channel); |
151 | 151 | ||
@@ -239,7 +239,7 @@ static int jsm_tty_open(struct uart_port *port) | |||
239 | channel->ch_cached_lsr = 0; | 239 | channel->ch_cached_lsr = 0; |
240 | channel->ch_stops_sent = 0; | 240 | channel->ch_stops_sent = 0; |
241 | 241 | ||
242 | termios = port->info->tty->termios; | 242 | termios = port->info->port.tty->termios; |
243 | channel->ch_c_cflag = termios->c_cflag; | 243 | channel->ch_c_cflag = termios->c_cflag; |
244 | channel->ch_c_iflag = termios->c_iflag; | 244 | channel->ch_c_iflag = termios->c_iflag; |
245 | channel->ch_c_oflag = termios->c_oflag; | 245 | channel->ch_c_oflag = termios->c_oflag; |
@@ -272,7 +272,7 @@ static void jsm_tty_close(struct uart_port *port) | |||
272 | jsm_printk(CLOSE, INFO, &channel->ch_bd->pci_dev, "start\n"); | 272 | jsm_printk(CLOSE, INFO, &channel->ch_bd->pci_dev, "start\n"); |
273 | 273 | ||
274 | bd = channel->ch_bd; | 274 | bd = channel->ch_bd; |
275 | ts = channel->uart_port.info->tty->termios; | 275 | ts = channel->uart_port.info->port.tty->termios; |
276 | 276 | ||
277 | channel->ch_flags &= ~(CH_STOPI); | 277 | channel->ch_flags &= ~(CH_STOPI); |
278 | 278 | ||
@@ -515,7 +515,7 @@ void jsm_input(struct jsm_channel *ch) | |||
515 | if (!ch) | 515 | if (!ch) |
516 | return; | 516 | return; |
517 | 517 | ||
518 | tp = ch->uart_port.info->tty; | 518 | tp = ch->uart_port.info->port.tty; |
519 | 519 | ||
520 | bd = ch->ch_bd; | 520 | bd = ch->ch_bd; |
521 | if(!bd) | 521 | if(!bd) |