Skip to content

Commit

Permalink
serial: amba-pl010: fix set_ldisc
Browse files Browse the repository at this point in the history
Commit d87d9b7 ("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>
  • Loading branch information
Mika Westerberg authored and Greg Kroah-Hartman committed Sep 20, 2010
1 parent 2422084 commit 476f771
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions drivers/serial/amba-pl010.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 476f771

Please sign in to comment.