diff options
Diffstat (limited to 'drivers/serial/pxa.c')
| -rw-r--r-- | drivers/serial/pxa.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c index 08b08d6ae904..461c81c93207 100644 --- a/drivers/serial/pxa.c +++ b/drivers/serial/pxa.c | |||
| @@ -274,14 +274,11 @@ static unsigned int serial_pxa_tx_empty(struct uart_port *port) | |||
| 274 | static unsigned int serial_pxa_get_mctrl(struct uart_port *port) | 274 | static unsigned int serial_pxa_get_mctrl(struct uart_port *port) |
| 275 | { | 275 | { |
| 276 | struct uart_pxa_port *up = (struct uart_pxa_port *)port; | 276 | struct uart_pxa_port *up = (struct uart_pxa_port *)port; |
| 277 | unsigned long flags; | ||
| 278 | unsigned char status; | 277 | unsigned char status; |
| 279 | unsigned int ret; | 278 | unsigned int ret; |
| 280 | 279 | ||
| 281 | return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR; | 280 | return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR; |
| 282 | spin_lock_irqsave(&up->port.lock, flags); | ||
| 283 | status = serial_in(up, UART_MSR); | 281 | status = serial_in(up, UART_MSR); |
| 284 | spin_unlock_irqrestore(&up->port.lock, flags); | ||
| 285 | 282 | ||
| 286 | ret = 0; | 283 | ret = 0; |
| 287 | if (status & UART_MSR_DCD) | 284 | if (status & UART_MSR_DCD) |
