From: Jonas Aaberg Date: Mon, 9 Aug 2010 12:09:12 +0000 (+0000) Subject: DMAENGINE: ste_dma40: don't pause/resume non-executing channels X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3ac012af3b1b3a6b373f3a9f19c5362974856c2c;p=linux-beck.git DMAENGINE: ste_dma40: don't pause/resume non-executing channels There is no point in pausing what isn't running. Signed-off-by: Jonas Aaberg Signed-off-by: Linus Walleij Signed-off-by: Dan Williams --- diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index c9f485e3baeb..05d0a9937617 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -768,6 +768,9 @@ static int d40_pause(struct dma_chan *chan) int res = 0; unsigned long flags; + if (!d40c->busy) + return 0; + spin_lock_irqsave(&d40c->lock, flags); res = d40_channel_execute_command(d40c, D40_DMA_SUSPEND_REQ); @@ -792,6 +795,9 @@ static int d40_resume(struct dma_chan *chan) int res = 0; unsigned long flags; + if (!d40c->busy) + return 0; + spin_lock_irqsave(&d40c->lock, flags); if (d40c->base->rev == 0)