summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2014-10-15 21:38:49 +0530
committerVinod Koul <vinod.koul@intel.com>2014-10-15 21:38:49 +0530
commit2856fcdc1f7b6dc237afc2dbec6fbd21fe88dd4e (patch)
treedf1adfeb56129acd267b658f81350437a5361b57 /drivers/tty
parent639559ada6194b722304fe267455b5bdf75c2f90 (diff)
parenta500789d42f478bc5511e1ddafadc323a6036d11 (diff)
downloadlinux-2856fcdc1f7b6dc237afc2dbec6fbd21fe88dd4e.tar.bz2
Merge branch 'topic/dma_control_cleanup_acks' into for-linus
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/sh-sci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 3081e46085ce..eb17c7124e72 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1403,7 +1403,7 @@ static void work_fn_rx(struct work_struct *work)
unsigned long flags;
int count;
- chan->device->device_control(chan, DMA_TERMINATE_ALL, 0);
+ dmaengine_terminate_all(chan);
dev_dbg(port->dev, "Read %zu bytes with cookie %d\n",
sh_desc->partial, sh_desc->cookie);