On Fri, Feb 14, 2020 at 10:43:34AM -0500, Sasha Levin wrote: > From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > [ Upstream commit 6dbd54e4154dfe386b3333687de15be239576617 ] > > This reverts commit 751d0017334db9c4d68a8909c59f662a6ecbcec6. > > The wrong commit got added to the tty-next tree, the correct one is in > the tty-linus branch. > > Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > Cc: David Engraf <david.engraf@xxxxxxxxx> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> > --- > drivers/tty/serial/atmel_serial.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c > index 1ba9bc667e136..ab4d4a0b36497 100644 > --- a/drivers/tty/serial/atmel_serial.c > +++ b/drivers/tty/serial/atmel_serial.c > @@ -2270,6 +2270,9 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios, > mode |= ATMEL_US_USMODE_NORMAL; > } > > + /* set the mode, clock divisor, parity, stop bits and data size */ > + atmel_uart_writel(port, ATMEL_US_MR, mode); > + > /* > * Set the baud rate: > * Fractional baudrate allows to setup output frequency more > -- > 2.20.1 > Are you sure this is correct to be added? This was the result of some fun merge problems, I don't think it's needed anywhere else... greg k-h
