diff options
author | Rabin Vincent <rabin.vincent@stericsson.com> | 2013-05-27 16:03:40 +0200 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2013-05-27 19:50:32 +0530 |
commit | 9ecb41bd8cf002fd8f3e063db4df81647ddd623c (patch) | |
tree | e20ce03e504fad666359c65fb9224d806c4c6fad /drivers/dma | |
parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) | |
download | linux-3.10-9ecb41bd8cf002fd8f3e063db4df81647ddd623c.tar.gz linux-3.10-9ecb41bd8cf002fd8f3e063db4df81647ddd623c.tar.bz2 linux-3.10-9ecb41bd8cf002fd8f3e063db4df81647ddd623c.zip |
dmaengine: ste_dma40: fix pm runtime ref counting
The pm runtime reference counting of the driver is broken for the case
when there is more than one transfer queued, leading to the device being
runtime suspend while active. Fix it.
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Cc: stable@vger.kernel.org
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/ste_dma40.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 1734feec47b..71bf4ec300e 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -1566,10 +1566,12 @@ static void dma_tc_handle(struct d40_chan *d40c) return; } - if (d40_queue_start(d40c) == NULL) + if (d40_queue_start(d40c) == NULL) { d40c->busy = false; - pm_runtime_mark_last_busy(d40c->base->dev); - pm_runtime_put_autosuspend(d40c->base->dev); + + pm_runtime_mark_last_busy(d40c->base->dev); + pm_runtime_put_autosuspend(d40c->base->dev); + } d40_desc_remove(d40d); d40_desc_done(d40c, d40d); |