aboutsummaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2013-10-30 15:42:19 +0530
committerVinod Koul <vinod.koul@intel.com>2013-10-30 15:42:19 +0530
commitf0dad6e701cb66301287074c39183c7312139530 (patch)
treeb4a38d8dcc49206fcedae7192e898df1011a6810 /drivers/tty
parentb967aecf1714c10d1e6c045e43b6385884f1ca77 (diff)
parent7db5f7274a0b065abdc358be2a44b4a911d75707 (diff)
downloadlinux-linaro-stable-f0dad6e701cb66301287074c39183c7312139530.tar.gz
Merge branch 'dma_complete' into next
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 537750261aaa..7d8103cd3e2e 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1433,7 +1433,7 @@ static void work_fn_rx(struct work_struct *work)
desc = s->desc_rx[new];
if (dma_async_is_tx_complete(s->chan_rx, s->active_rx, NULL, NULL) !=
- DMA_SUCCESS) {
+ DMA_COMPLETE) {
/* Handle incomplete DMA receive */
struct dma_chan *chan = s->chan_rx;
struct shdma_desc *sh_desc = container_of(desc,