Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[~andy/linux] / drivers / dma / dw_dmac.c

diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index 263b70ee856246f34c22cc35eef4e60c57d320e4..a3991ab0d67e06cf6e99d41d9a1a923109dc1a06 100644 (file)
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -781,7 +781,8 @@ err_desc_get:
        return NULL;
 }
 
-static int dwc_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd)
+static int dwc_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
+                      unsigned long arg)
 {
        struct dw_dma_chan      *dwc = to_dw_dma_chan(chan);
        struct dw_dma           *dw = to_dw_dma(chan->device);
@@ -841,11 +842,7 @@ dwc_tx_status(struct dma_chan *chan,
                ret = dma_async_is_complete(cookie, last_complete, last_used);
        }
 
-       if (txstate) {
-               txstate->last = last_complete;
-               txstate->used = last_used;
-               txstate->residue = 0;
-       }
+       dma_set_tx_state(txstate, last_complete, last_used, 0);
 
        return ret;
 }