Prev: [PATCH 09/31] specialix; Kill the BKL
Next: [PATCH 26/31] tty: reorder ldisc locking
From: Arnd Bergmann on 1 Jun 2010 17:00
The ldisc number now gets passed into ->set_ldisc.

Signed-off-by: Arnd Bergmann <arnd(a)arndb.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 891e1dd..93c8358 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2409,14 +2409,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.0.4

--
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 09/31] specialix; Kill the BKL
Next: [PATCH 26/31] tty: reorder ldisc locking