aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/iop-adma.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/dma/iop-adma.c')
-rw-r--r--drivers/dma/iop-adma.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
index f2392d59568d..b1e3be089c52 100644
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@ -894,24 +894,14 @@ static enum dma_status iop_adma_status(struct dma_chan *chan,
894 struct dma_tx_state *txstate) 894 struct dma_tx_state *txstate)
895{ 895{
896 struct iop_adma_chan *iop_chan = to_iop_adma_chan(chan); 896 struct iop_adma_chan *iop_chan = to_iop_adma_chan(chan);
897 dma_cookie_t last_used; 897
898 dma_cookie_t last_complete; 898 ret = dma_cookie_status(chan, cookie, txstate);
899 enum dma_status ret;
900
901 last_used = chan->cookie;
902 last_complete = chan->completed_cookie;
903 dma_set_tx_state(txstate, last_complete, last_used, 0);
904 ret = dma_async_is_complete(cookie, last_complete, last_used);
905 if (ret == DMA_SUCCESS) 899 if (ret == DMA_SUCCESS)
906 return ret; 900 return ret;
907 901
908 iop_adma_slot_cleanup(iop_chan); 902 iop_adma_slot_cleanup(iop_chan);
909 903
910 last_used = chan->cookie; 904 return dma_cookie_status(chan, cookie, txstate);
911 last_complete = chan->completed_cookie;
912 dma_set_tx_state(txstate, last_complete, last_used, 0);
913
914 return dma_async_is_complete(cookie, last_complete, last_used);
915} 905}
916 906
917static irqreturn_t iop_adma_eot_handler(int irq, void *data) 907static irqreturn_t iop_adma_eot_handler(int irq, void *data)