aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/atmel_serial.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index 4a0f86fa1e9..6b844d42257 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -1256,12 +1256,7 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios,
1256 1256
1257static void atmel_set_ldisc(struct uart_port *port, int new) 1257static void atmel_set_ldisc(struct uart_port *port, int new)
1258{ 1258{
1259 int line = port->line; 1259 if (new == N_PPS) {
1260
1261 if (line >= port->state->port.tty->driver->num)
1262 return;
1263
1264 if (port->state->port.tty->ldisc->ops->num == N_PPS) {
1265 port->flags |= UPF_HARDPPS_CD; 1260 port->flags |= UPF_HARDPPS_CD;
1266 atmel_enable_ms(port); 1261 atmel_enable_ms(port);
1267 } else { 1262 } else {