summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-30 11:04:29 +0100
committerMark Brown <broonie@linaro.org>2013-08-30 11:04:29 +0100
commitc85fa502ef8cd81a8e31cd4a71e890f6dea6f140 (patch)
tree3cbf8fb661d61cd59b2a146d22f3f9947d5e79d8 /sound
parent52b3a88439580ec32da58702968c5b70e2638424 (diff)
parent9b9ae16a97e08bdc4fd5e726a4d17119dbae5d8a (diff)
downloadop-kernel-dev-c85fa502ef8cd81a8e31cd4a71e890f6dea6f140.zip
op-kernel-dev-c85fa502ef8cd81a8e31cd4a71e890f6dea6f140.tar.gz
Merge remote-tracking branch 'asoc/topic/samsung' into tmp
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/samsung/dma.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c
index a0c67f6..9338d11 100644
--- a/sound/soc/samsung/dma.c
+++ b/sound/soc/samsung/dma.c
@@ -90,6 +90,13 @@ static void dma_enqueue(struct snd_pcm_substream *substream)
dma_info.period = prtd->dma_period;
dma_info.len = prtd->dma_period*limit;
+ if (dma_info.cap == DMA_CYCLIC) {
+ dma_info.buf = pos;
+ prtd->params->ops->prepare(prtd->params->ch, &dma_info);
+ prtd->dma_loaded += limit;
+ return;
+ }
+
while (prtd->dma_loaded < limit) {
pr_debug("dma_loaded: %d\n", prtd->dma_loaded);
OpenPOWER on IntegriCloud