Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1fbac44 authored by Thiemo Seufer's avatar Thiemo Seufer Committed by Linus Torvalds
Browse files

Update zilog timeout



Update zilog timeout, thanks Peter Fuerst.

Signed-off-by: default avatarThiemo Seufer <ths@networkno.de>
Cc: Martin Michlmayr <tbm@cyrius.com>
Cc: Peter Fuerst <pf@net.alphadv.de>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d05e96fe
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -862,6 +862,7 @@ ip22zilog_set_termios(struct uart_port *port, struct ktermios *termios,
	up->cflag = termios->c_cflag;

	ip22zilog_maybe_update_regs(up, ZILOG_CHANNEL_FROM_PORT(port));
	uart_update_timeout(port, termios->c_cflag, baud);

	spin_unlock_irqrestore(&up->port.lock, flags);
}
@@ -1017,6 +1018,8 @@ ip22serial_console_termios(struct console *con, char *options)
	}

	con->cflag = cflag | CS8;			/* 8N1 */

	uart_update_timeout(&ip22zilog_port_table[con->index].port, cflag, baud);
}

static int __init ip22zilog_console_setup(struct console *con, char *options)