serial: core, do not set DTR/RTS twice on startup
In .dtr_rts we do: uart_set_mctrl(uport, TIOCM_DTR | TIOCM_RTS) and call uart_update_termios. It does: uart_set_mctrl(port, TIOCM_DTR | TIOCM_RTS) once again. As the only callsite of uart_update_termios is .dtr_rts, remove the uart_set_mctrl from uart_update_termios to not set it twice. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
c7d7abff40
commit
303a7a1199
|
@ -1483,20 +1483,6 @@ static void uart_hangup(struct tty_struct *tty)
|
||||||
static void uart_update_termios(struct tty_struct *tty,
|
static void uart_update_termios(struct tty_struct *tty,
|
||||||
struct uart_state *state)
|
struct uart_state *state)
|
||||||
{
|
{
|
||||||
struct uart_port *port = state->uart_port;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If the device failed to grab its irq resources,
|
|
||||||
* or some other error occurred, don't try to talk
|
|
||||||
* to the port hardware.
|
|
||||||
*/
|
|
||||||
if (!(tty->flags & (1 << TTY_IO_ERROR))) {
|
|
||||||
/*
|
|
||||||
* And finally enable the RTS and DTR signals.
|
|
||||||
*/
|
|
||||||
if (tty->termios->c_cflag & CBAUD)
|
|
||||||
uart_set_mctrl(port, TIOCM_DTR | TIOCM_RTS);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int uart_carrier_raised(struct tty_port *port)
|
static int uart_carrier_raised(struct tty_port *port)
|
||||||
|
|
Loading…
Reference in New Issue