summaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2018-02-18 22:02:46 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-02-28 15:29:59 +0100
commit42afa627c338e22bbde06c95bd7b46f960c91f79 (patch)
tree81218297c50c973a6d2ece14aa98b38919022cb6 /drivers/tty/serial
parent4238c00bb154be840c11540a81c5e99faa06a631 (diff)
downloadtalos-op-linux-42afa627c338e22bbde06c95bd7b46f960c91f79.tar.gz
talos-op-linux-42afa627c338e22bbde06c95bd7b46f960c91f79.zip
serial: imx: drop check for enabled dma in .startup
imx_shutdown() calls imx_disable_dma if .dma_is_enabled. So after imx_shudown() completes, .dma_is_enabled is zero. For this reason .dma_is_enabled is also zero when imx_startup() is called. So the check for this variable being zero can be dropped. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Reviewed-by: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial')
-rw-r--r--drivers/tty/serial/imx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index c60ce00e701c..689a117943a0 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1257,7 +1257,7 @@ static int imx_startup(struct uart_port *port)
writel(USR1_RTSD | USR1_DTRD, sport->port.membase + USR1);
writel(USR2_ORE, sport->port.membase + USR2);
- if (dma_is_inited && !sport->dma_is_enabled)
+ if (dma_is_inited)
imx_enable_dma(sport);
temp = readl(sport->port.membase + UCR1) & ~UCR1_RRDYEN;
OpenPOWER on IntegriCloud