diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-21 03:44:24 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-21 03:44:24 +0400 |
| commit | 36ff4a5517779355f4bd62030cdb8498c3954f29 (patch) | |
| tree | b7afaeef8b3eca3ddf3ebfc99b2562e850d52582 /drivers/serial/amba-pl010.c | |
| parent | ed1cde68365c1251b920900c51e73675ff38dc66 (diff) | |
| parent | e3671ac429fe50cf0c1b4f1dc4b7237207f1d956 (diff) | |
| download | linux-36ff4a5517779355f4bd62030cdb8498c3954f29.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
serial: mfd: fix bug in serial_hsu_remove()
serial: amba-pl010: fix set_ldisc
Diffstat (limited to 'drivers/serial/amba-pl010.c')
| -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, spin_unlock_irqrestore(&uap->port.lock, flags); } -static void pl010_set_ldisc(struct uart_port *port) +static void pl010_set_ldisc(struct uart_port *port, int new) { - int line = port->line; - - if (line >= port->state->port.tty->driver->num) - return; - - if (port->state->port.tty->ldisc->ops->num == N_PPS) { + if (new == N_PPS) { port->flags |= UPF_HARDPPS_CD; pl010_enable_ms(port); } else |