diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-22 22:42:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-22 22:42:19 +0100 |
| commit | 4fbd269f1f9f8020dd9474b60e55c4f34d267b08 (patch) | |
| tree | 61f6b7e35ea8f427f0c2c5c6e5f5e3244c311818 /drivers/tty/serial/pch_uart.c | |
| parent | tty/serial: at91: disable uart timer at start of shutdown (diff) | |
| parent | tty: xuartps: Properly guard sysrq specific code (diff) | |
| download | linux-4fbd269f1f9f8020dd9474b60e55c4f34d267b08.tar.xz linux-4fbd269f1f9f8020dd9474b60e55c4f34d267b08.zip | |
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>
Diffstat (limited to 'drivers/tty/serial/pch_uart.c')
| -rw-r--r-- | drivers/tty/serial/pch_uart.c | 10 |
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; |