diff options
Diffstat (limited to 'drivers/serial/bfin_sport_uart.c')
-rw-r--r-- | drivers/serial/bfin_sport_uart.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/bfin_sport_uart.c b/drivers/serial/bfin_sport_uart.c index c108b1a0ce9..088bb35475f 100644 --- a/drivers/serial/bfin_sport_uart.c +++ b/drivers/serial/bfin_sport_uart.c | |||
@@ -178,7 +178,7 @@ static int sport_uart_setup(struct sport_uart_port *up, int sclk, int baud_rate) | |||
178 | static irqreturn_t sport_uart_rx_irq(int irq, void *dev_id) | 178 | static irqreturn_t sport_uart_rx_irq(int irq, void *dev_id) |
179 | { | 179 | { |
180 | struct sport_uart_port *up = dev_id; | 180 | struct sport_uart_port *up = dev_id; |
181 | struct tty_struct *tty = up->port.info->port.tty; | 181 | struct tty_struct *tty = up->port.state->port.tty; |
182 | unsigned int ch; | 182 | unsigned int ch; |
183 | 183 | ||
184 | do { | 184 | do { |
@@ -205,7 +205,7 @@ static irqreturn_t sport_uart_tx_irq(int irq, void *dev_id) | |||
205 | static irqreturn_t sport_uart_err_irq(int irq, void *dev_id) | 205 | static irqreturn_t sport_uart_err_irq(int irq, void *dev_id) |
206 | { | 206 | { |
207 | struct sport_uart_port *up = dev_id; | 207 | struct sport_uart_port *up = dev_id; |
208 | struct tty_struct *tty = up->port.info->port.tty; | 208 | struct tty_struct *tty = up->port.state->port.tty; |
209 | unsigned int stat = SPORT_GET_STAT(up); | 209 | unsigned int stat = SPORT_GET_STAT(up); |
210 | 210 | ||
211 | /* Overflow in RX FIFO */ | 211 | /* Overflow in RX FIFO */ |
@@ -290,7 +290,7 @@ fail1: | |||
290 | 290 | ||
291 | static void sport_uart_tx_chars(struct sport_uart_port *up) | 291 | static void sport_uart_tx_chars(struct sport_uart_port *up) |
292 | { | 292 | { |
293 | struct circ_buf *xmit = &up->port.info->xmit; | 293 | struct circ_buf *xmit = &up->port.state->xmit; |
294 | 294 | ||
295 | if (SPORT_GET_STAT(up) & TXF) | 295 | if (SPORT_GET_STAT(up) & TXF) |
296 | return; | 296 | return; |