mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
serial: fix termios settings in open
Move termios initialization in open into uart_dtr_rts to make sure it always gets called when necessary. Based on a suggestion from Alan Cox. Alan writes: Ok this sort of makes sense. Something isn't getting initialised and both getty and minicom will do a termios set which is sorting it out. This is occurring because the generic block_til_ready sets ASYNCB_NORMAL_ACTIVE so the termios updating gets skipped. This patch should cure it and then we can think about doing it more elegantly by getting the serial layer to use tty_port_open, kfifo and the like and removing the tons of repeated crap in all the drivers. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reported-by: Tony Luck <tony.luck@intel.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Tony Luck <tony.luck@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
74c2107759
commit
3f582b8c11
1 changed files with 9 additions and 10 deletions
|
@ -1520,8 +1520,16 @@ static void uart_dtr_rts(struct tty_port *port, int onoff)
|
|||
struct uart_state *state = container_of(port, struct uart_state, port);
|
||||
struct uart_port *uport = state->uart_port;
|
||||
|
||||
if (onoff)
|
||||
if (onoff) {
|
||||
uart_set_mctrl(uport, TIOCM_DTR | TIOCM_RTS);
|
||||
|
||||
/*
|
||||
* If this is the first open to succeed,
|
||||
* adjust things to suit.
|
||||
*/
|
||||
if (!test_and_set_bit(ASYNCB_NORMAL_ACTIVE, &port->flags))
|
||||
uart_update_termios(port->tty, state);
|
||||
}
|
||||
else
|
||||
uart_clear_mctrl(uport, TIOCM_DTR | TIOCM_RTS);
|
||||
}
|
||||
|
@ -1636,15 +1644,6 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
|
|||
if (retval == 0)
|
||||
retval = tty_port_block_til_ready(port, tty, filp);
|
||||
|
||||
/*
|
||||
* If this is the first open to succeed, adjust things to suit.
|
||||
*/
|
||||
if (retval == 0 && !(port->flags & ASYNC_NORMAL_ACTIVE)) {
|
||||
set_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
|
||||
|
||||
uart_update_termios(tty, state);
|
||||
}
|
||||
|
||||
fail:
|
||||
return retval;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue