Prev: [PATCH 54/68] serial: general fixes in the serial_rs485 structure
Next: [PATCH 29/68] tty: Move the vt_tty field from the vc_data into the standard tty_port
From: Greg Kroah-Hartman on 10 Aug 2010 18:10
From: Arnd Bergmann <arnd(a)arndb.de>

The ldisc number now gets passed into ->set_ldisc.

Signed-off-by: Arnd Bergmann <arnd(a)arndb.de>
Cc: Alan Cox <alan(a)lxorguk.ukuu.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>
---
drivers/serial/8250.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index bc8ed4b..355148d 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2404,14 +2404,9 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
}

static void
-serial8250_set_ldisc(struct uart_port *port)
+serial8250_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;
serial8250_enable_ms(port);
} else
--
1.7.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 54/68] serial: general fixes in the serial_rs485 structure
Next: [PATCH 29/68] tty: Move the vt_tty field from the vc_data into the standard tty_port