diff options
| author | Mika Westerberg <mika.westerberg@iki.fi> | 2010-09-04 10:23:23 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-20 16:30:00 -0700 |
| commit | 476f771cb9b6cd4845dcd18f16a2f03a89ee63fc (patch) | |
| tree | 66395d1958c57f837ac22560c49b655ad4edcc92 | |
| parent | 2422084a94fcd5038406261b331672a13c92c050 (diff) | |
| download | linux-stable-476f771cb9b6cd4845dcd18f16a2f03a89ee63fc.tar.gz linux-stable-476f771cb9b6cd4845dcd18f16a2f03a89ee63fc.tar.bz2 linux-stable-476f771cb9b6cd4845dcd18f16a2f03a89ee63fc.zip | |
serial: amba-pl010: fix set_ldisc
Commit d87d9b7d1 ("tty: serial - fix tty referencing in set_ldisc") changed
set_ldisc to take ldisc number as parameter. This patch fixes AMBA PL010 driver
according the new prototype.
Signed-off-by: Mika Westerberg <mika.westerberg@iki.fi>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -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 |