From e7923ce38f5e107eb23719ba3a5356f0ddc92c91 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Wed, 9 Nov 2011 21:33:44 +0100
Subject: [PATCH] --- yaml --- r: 280669 b: refs/heads/master c:
 b54bf3b24908cd4f6a1d24276f795cfbccba5a3f h: refs/heads/master i:   280667:
 ca2ef891639284780e11f4176a894054b0f7b2f6 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/tty/serial/atmel_serial.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 89c37bdea218..0aa41c73fed1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 027d7dacf73273dbe07a75b2ef5579616f17272c
+refs/heads/master: b54bf3b24908cd4f6a1d24276f795cfbccba5a3f
diff --git a/trunk/drivers/tty/serial/atmel_serial.c b/trunk/drivers/tty/serial/atmel_serial.c
index 4a0f86fa1e90..6b844d422578 100644
--- a/trunk/drivers/tty/serial/atmel_serial.c
+++ b/trunk/drivers/tty/serial/atmel_serial.c
@@ -1256,12 +1256,7 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios,
 
 static void atmel_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;
 		atmel_enable_ms(port);
 	} else {