diff options
| -rw-r--r-- | drivers/serial/amba-pl010.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c index 50441ffe8e38..2904aa044126 100644 --- a/drivers/serial/amba-pl010.c +++ b/drivers/serial/amba-pl010.c | |||
| @@ -472,14 +472,9 @@ pl010_set_termios(struct uart_port *port, struct ktermios *termios, | |||
| 472 | spin_unlock_irqrestore(&uap->port.lock, flags); | 472 | spin_unlock_irqrestore(&uap->port.lock, flags); |
| 473 | } | 473 | } |
| 474 | 474 | ||
| 475 | static void pl010_set_ldisc(struct uart_port *port) | 475 | static void pl010_set_ldisc(struct uart_port *port, int new) |
| 476 | { | 476 | { |
| 477 | int line = port->line; | 477 | if (new == N_PPS) { |
| 478 | |||
| 479 | if (line >= port->state->port.tty->driver->num) | ||
| 480 | return; | ||
| 481 | |||
| 482 | if (port->state->port.tty->ldisc->ops->num == N_PPS) { | ||
| 483 | port->flags |= UPF_HARDPPS_CD; | 478 | port->flags |= UPF_HARDPPS_CD; |
| 484 | pl010_enable_ms(port); | 479 | pl010_enable_ms(port); |
| 485 | } else | 480 | } else |
