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 {