diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2014-10-15 18:08:49 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-10-15 18:08:49 +0200 |
| commit | 2856fcdc1f7b6dc237afc2dbec6fbd21fe88dd4e (patch) | |
| tree | df1adfeb56129acd267b658f81350437a5361b57 /drivers/tty | |
| parent | dmaengine: edma: check for echan->edesc => NULL in edma_dma_pause() (diff) | |
| parent | video: mx3fb: use dmaengine_terminate_all() API (diff) | |
| download | linux-2856fcdc1f7b6dc237afc2dbec6fbd21fe88dd4e.tar.xz linux-2856fcdc1f7b6dc237afc2dbec6fbd21fe88dd4e.zip | |
Merge branch 'topic/dma_control_cleanup_acks' into for-linus
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/sh-sci.c | 2 |
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); |