Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 476f771c authored by Mika Westerberg's avatar Mika Westerberg Committed by Greg Kroah-Hartman
Browse files

serial: amba-pl010: fix set_ldisc 



Commit d87d9b7d ("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: default avatarMika Westerberg <mika.westerberg@iki.fi>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2422084a

drivers/serial/amba-pl010.c

+2 −7
Original line number Diff line number Diff line
@@ -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