summaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/imx.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2018-03-02 11:07:25 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-03-09 19:21:01 +0100
commitdedc64e02f5da1c7bd0b4ec232341047a8b0142b (patch)
tree46fda2471e8defc0af3be5ff302075d3b0404ab7 /drivers/tty/serial/imx.c
parentserial: imx: setup fifo waterlevel before enabling aging timer (diff)
downloadlinux-dedc64e02f5da1c7bd0b4ec232341047a8b0142b.tar.xz
linux-dedc64e02f5da1c7bd0b4ec232341047a8b0142b.zip
serial: imx: Stop to receive in .stop_rx()
When the UART is used in DMA mode, .stop_rx() does nothing if the port isn't suspended. This is wrong as .stop_rx() should stop receiving characters unconditionally. When the port is about to be closed the DMA channel is stopped in .shutdown(), so this isn't necessary to be in .stop_rx() here, too. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/imx.c')
-rw-r--r--drivers/tty/serial/imx.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 9b92c49fc174..0ea98827ecbe 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -442,15 +442,6 @@ static void imx_stop_rx(struct uart_port *port)
struct imx_port *sport = (struct imx_port *)port;
u32 ucr1, ucr2;
- if (sport->dma_is_rxing) {
- if (sport->port.suspended) {
- dmaengine_terminate_all(sport->dma_chan_rx);
- sport->dma_is_rxing = 0;
- } else {
- return;
- }
- }
-
ucr2 = imx_uart_readl(sport, UCR2);
imx_uart_writel(sport, ucr2 & ~UCR2_RXEN, UCR2);