Commit a0821df6 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

8250: fix set_ldisc operation 



The ldisc number now gets passed into ->set_ldisc.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e142a31d

drivers/serial/8250.c

+2 −7
Original line number Original line Diff line number Diff line
@@ -2404,14 +2404,9 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios, 
}

}





static void

static void

serial8250_set_ldisc(struct uart_port *port)

serial8250_set_ldisc(struct uart_port *port, int new)

{

{

	int line = port->line;

	if (new == N_PPS) {



	if (line >= port->state->port.tty->driver->num)

		return;



	if (port->state->port.tty->ldisc->ops->num == N_PPS) {

		port->flags |= UPF_HARDPPS_CD;

		port->flags |= UPF_HARDPPS_CD;

		serial8250_enable_ms(port);

		serial8250_enable_ms(port);

	} else

	} else