aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2010-06-01 22:53:11 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-10 13:47:44 -0700
commita0821df6e57c8af0053963d0d08c8d5198ea077d (patch)
tree05086ccd247a7c27320c31093cbc5df66e8b86a2 /drivers/serial
parente142a31da34b42458e10026b554e66127739cf23 (diff)
downloadkernel_samsung_tuna-a0821df6e57c8af0053963d0d08c8d5198ea077d.zip
kernel_samsung_tuna-a0821df6e57c8af0053963d0d08c8d5198ea077d.tar.gz
kernel_samsung_tuna-a0821df6e57c8af0053963d0d08c8d5198ea077d.tar.bz2
8250: fix set_ldisc operation
The ldisc number now gets passed into ->set_ldisc. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/8250.c9
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