From 3ba70a13859801fb818a5999638a7ca20fa852ce Mon Sep 17 00:00:00 2001 From: Zhang Wei Date: Thu, 13 Mar 2008 17:45:28 -0700 Subject: [PATCH] --- yaml --- r: 87355 b: refs/heads/master c: 9c98718e7371fa781043d5a2e70cecebec048091 h: refs/heads/master i: 87353: a8f0a34fb307f1133ea025fa0ca273c61fcf1fca 87351: 480273c4c7c162edd46c6484847297f277d106a4 v: v3 --- [refs] | 2 +- trunk/drivers/dma/fsldma.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f3961a9a2bcd..fc1aef31c859 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2187c269ad29510f1d65ec684133d1d3426d0eed +refs/heads/master: 9c98718e7371fa781043d5a2e70cecebec048091 diff --git a/trunk/drivers/dma/fsldma.c b/trunk/drivers/dma/fsldma.c index cbd5b9684521..ad2f938597e2 100644 --- a/trunk/drivers/dma/fsldma.c +++ b/trunk/drivers/dma/fsldma.c @@ -539,7 +539,6 @@ static void fsl_chan_ld_cleanup(struct fsl_dma_chan *fsl_chan) spin_lock_irqsave(&fsl_chan->desc_lock, flags); - fsl_dma_update_completed_cookie(fsl_chan); dev_dbg(fsl_chan->dev, "chan completed_cookie = %d\n", fsl_chan->completed_cookie); list_for_each_entry_safe(desc, _desc, &fsl_chan->ld_queue, node) { @@ -710,6 +709,7 @@ static irqreturn_t fsl_dma_chan_do_interrupt(int irq, void *data) dev_dbg(fsl_chan->dev, "event: clndar %p, nlndar %p\n", (void *)get_cdar(fsl_chan), (void *)get_ndar(fsl_chan)); stat &= ~FSL_DMA_SR_EOSI; + fsl_dma_update_completed_cookie(fsl_chan); } /* If it current transfer is the end-of-transfer,