Hi Uwe, On Tue, Feb 27, 2018 at 10:45:01PM +0100, Uwe Kleine-König wrote: > Make sure that UCR1.RXDMAEN and UCR1.ATDMAEN (for the DMA case) and > UCR1.RRDYEN and UCR2.ATEN (for the PIO case) are off when UCR1.RXEN is > disabled. This ensures that the fifo isn't read with RX disabled which > results in an exception. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> > --- > drivers/tty/serial/imx.c | 156 +++++++++++++++++++++++++++++------------------ > 1 file changed, 97 insertions(+), 59 deletions(-) This looks like a rebasing accident. The patch is huge and I can't see it has anything to do with the subject. > @@ -416,23 +439,25 @@ static void imx_stop_tx(struct uart_port *port) > if (sport->dma_is_txing) > return; > > - temp = imx_uart_readl(sport, UCR1); > - imx_uart_writel(sport, temp & ~UCR1_TXMPTYEN, UCR1); > + ucr1 = imx_uart_readl(sport, UCR1); > + ucr1 &= ~UCR1_TXMPTYEN; > + imx_uart_writel(sport, ucr1, UCR1); Particularly this hunk looks like a cosmetic cleanup and not something that should be in this patch. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
