diff options
Diffstat (limited to 'drivers/serial/sc26xx.c')
-rw-r--r-- | drivers/serial/sc26xx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/serial/sc26xx.c b/drivers/serial/sc26xx.c index e0be11ceaa25..75038ad2b242 100644 --- a/drivers/serial/sc26xx.c +++ b/drivers/serial/sc26xx.c | |||
@@ -140,8 +140,8 @@ static struct tty_struct *receive_chars(struct uart_port *port) | |||
140 | char flag; | 140 | char flag; |
141 | u8 status; | 141 | u8 status; |
142 | 142 | ||
143 | if (port->info != NULL) /* Unopened serial console */ | 143 | if (port->state != NULL) /* Unopened serial console */ |
144 | tty = port->info->port.tty; | 144 | tty = port->state->port.tty; |
145 | 145 | ||
146 | while (limit-- > 0) { | 146 | while (limit-- > 0) { |
147 | status = READ_SC_PORT(port, SR); | 147 | status = READ_SC_PORT(port, SR); |
@@ -190,10 +190,10 @@ static void transmit_chars(struct uart_port *port) | |||
190 | { | 190 | { |
191 | struct circ_buf *xmit; | 191 | struct circ_buf *xmit; |
192 | 192 | ||
193 | if (!port->info) | 193 | if (!port->state) |
194 | return; | 194 | return; |
195 | 195 | ||
196 | xmit = &port->info->xmit; | 196 | xmit = &port->state->xmit; |
197 | if (uart_circ_empty(xmit) || uart_tx_stopped(port)) { | 197 | if (uart_circ_empty(xmit) || uart_tx_stopped(port)) { |
198 | sc26xx_disable_irq(port, IMR_TXRDY); | 198 | sc26xx_disable_irq(port, IMR_TXRDY); |
199 | return; | 199 | return; |
@@ -316,7 +316,7 @@ static void sc26xx_stop_tx(struct uart_port *port) | |||
316 | /* port->lock held by caller. */ | 316 | /* port->lock held by caller. */ |
317 | static void sc26xx_start_tx(struct uart_port *port) | 317 | static void sc26xx_start_tx(struct uart_port *port) |
318 | { | 318 | { |
319 | struct circ_buf *xmit = &port->info->xmit; | 319 | struct circ_buf *xmit = &port->state->xmit; |
320 | 320 | ||
321 | while (!uart_circ_empty(xmit)) { | 321 | while (!uart_circ_empty(xmit)) { |
322 | if (!(READ_SC_PORT(port, SR) & SR_TXRDY)) { | 322 | if (!(READ_SC_PORT(port, SR) & SR_TXRDY)) { |