diff options
Diffstat (limited to 'drivers/serial/pxa.c')
-rw-r--r-- | drivers/serial/pxa.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c index a48a8a13d87b..ad48919c0415 100644 --- a/drivers/serial/pxa.c +++ b/drivers/serial/pxa.c | |||
@@ -96,7 +96,7 @@ static void serial_pxa_stop_rx(struct uart_port *port) | |||
96 | 96 | ||
97 | static inline void receive_chars(struct uart_pxa_port *up, int *status) | 97 | static inline void receive_chars(struct uart_pxa_port *up, int *status) |
98 | { | 98 | { |
99 | struct tty_struct *tty = up->port.info->port.tty; | 99 | struct tty_struct *tty = up->port.state->port.tty; |
100 | unsigned int ch, flag; | 100 | unsigned int ch, flag; |
101 | int max_count = 256; | 101 | int max_count = 256; |
102 | 102 | ||
@@ -161,7 +161,7 @@ static inline void receive_chars(struct uart_pxa_port *up, int *status) | |||
161 | 161 | ||
162 | static void transmit_chars(struct uart_pxa_port *up) | 162 | static void transmit_chars(struct uart_pxa_port *up) |
163 | { | 163 | { |
164 | struct circ_buf *xmit = &up->port.info->xmit; | 164 | struct circ_buf *xmit = &up->port.state->xmit; |
165 | int count; | 165 | int count; |
166 | 166 | ||
167 | if (up->port.x_char) { | 167 | if (up->port.x_char) { |
@@ -220,7 +220,7 @@ static inline void check_modem_status(struct uart_pxa_port *up) | |||
220 | if (status & UART_MSR_DCTS) | 220 | if (status & UART_MSR_DCTS) |
221 | uart_handle_cts_change(&up->port, status & UART_MSR_CTS); | 221 | uart_handle_cts_change(&up->port, status & UART_MSR_CTS); |
222 | 222 | ||
223 | wake_up_interruptible(&up->port.info->delta_msr_wait); | 223 | wake_up_interruptible(&up->port.state->delta_msr_wait); |
224 | } | 224 | } |
225 | 225 | ||
226 | /* | 226 | /* |