Merge branch 'fixes' into tty-next

This was a "forgotten" branch of tty fixes that somehow didn't make it
into my "main" branches, my fault.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index 9cbd3acaf37f..8fa1134e0051 100644
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -1508,10 +1508,14 @@ static int pch_uart_verify_port(struct uart_port *port,
                         __func__);
                 return -EOPNOTSUPP;
 #endif
-                dev_info(priv->port.dev, "PCH UART : Use DMA Mode\n");
-                if (!priv->use_dma)
+                if (!priv->use_dma) {
                         pch_request_dma(port);
-                priv->use_dma = 1;
+                        if (priv->chan_rx)
+                                priv->use_dma = 1;
+                }
+                dev_info(priv->port.dev, "PCH UART: %s\n",
+                                priv->use_dma ?
+                                "Use DMA Mode" : "No DMA");
         }
 
         return 0;