From d9a42d8fed0172086c582d63943ab4a1e5c2a1d7 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 1 Jun 2010 22:53:11 +0200
Subject: [PATCH] --- yaml --- r: 207917 b: refs/heads/master c:
 a0821df6e57c8af0053963d0d08c8d5198ea077d h: refs/heads/master i:   207915:
 a336e0a13d4b498738daa6f8c64278c2fafaa757 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/serial/8250.c | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 2aa8cd5594ef..ddc0aaa80003 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e142a31da34b42458e10026b554e66127739cf23
+refs/heads/master: a0821df6e57c8af0053963d0d08c8d5198ea077d
diff --git a/trunk/drivers/serial/8250.c b/trunk/drivers/serial/8250.c
index bc8ed4be9073..355148dc085e 100644
--- a/trunk/drivers/serial/8250.c
+++ b/trunk/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