diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-17 09:33:18 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-17 09:33:18 -0800 |
| commit | 8f898bfd048f65856d8911a89b1616ad3e677c6c (patch) | |
| tree | 8441b94166de6d33584ea0aad067926c7b1cc99f /drivers/tty/serial/amba-pl011.c | |
| parent | 4d0ed18277cc6f07513ee0b04475f19cd69e75ef (diff) | |
Revert "serial: pl011: use DMA RX polling by default"
This reverts commit 17438217a6f5e33d920ed3821a4b857311cc2872 on request
of Linus Walleij:
Greg can you please drop or revert
commit 17438217a6f5e33d920ed3821a4b857311cc2872
"serial: pl011: use DMA RX polling by default"
from the TTY tree until this has been sorted out?
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/amba-pl011.c')
| -rw-r--r-- | drivers/tty/serial/amba-pl011.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index c8cc8f02b092..a183aceb6d15 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -325,7 +325,7 @@ static void pl011_dma_probe_initcall(struct device *dev, struct uart_amba_port * dmaengine_slave_config(chan, &rx_conf); uap->dmarx.chan = chan; - if (plat) { + if (plat && plat->dma_rx_poll_enable) { /* Set poll rate if specified. */ if (plat->dma_rx_poll_rate) { uap->dmarx.auto_poll_rate = false; |