diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-12 16:50:10 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-12 16:50:10 -0700 |
| commit | ff299f1b1cb4e0c44a3f76d1f8ee4eb2f64f098f (patch) | |
| tree | 9e4d85cfc0c5a8394bc1fcafd7c406c5ac558c70 /drivers/dma/ste_dma40.c | |
| parent | 7d428ce284fce4aacb215ca15d0274e7261864a3 (diff) | |
| parent | ae7b6dccf6711e8d5815688f1572ab55bf5b3069 (diff) | |
| download | linux-ff299f1b1cb4e0c44a3f76d1f8ee4eb2f64f098f.tar.bz2 | |
Merge tag 's3c24xx-driver-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
From Kukjin Kim, driver updats for s3c24xx:
- move cpufreq driver into drivers/
- add pinctrl-s3c24xx driver
- cleanup OF in gpio driver
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/dma/ste_dma40.c')
| -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 6ed775736853..7f23d45166c3 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -1613,10 +1613,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); |