diff options
author | Mark Brown <broonie@linaro.org> | 2013-08-30 06:04:29 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-30 06:04:29 -0400 |
commit | c85fa502ef8cd81a8e31cd4a71e890f6dea6f140 (patch) | |
tree | 3cbf8fb661d61cd59b2a146d22f3f9947d5e79d8 /sound | |
parent | 52b3a88439580ec32da58702968c5b70e2638424 (diff) | |
parent | 9b9ae16a97e08bdc4fd5e726a4d17119dbae5d8a (diff) |
Merge remote-tracking branch 'asoc/topic/samsung' into tmp
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/samsung/dma.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c index a0c67f60f594..9338d11e9216 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) | |||
90 | dma_info.period = prtd->dma_period; | 90 | dma_info.period = prtd->dma_period; |
91 | dma_info.len = prtd->dma_period*limit; | 91 | dma_info.len = prtd->dma_period*limit; |
92 | 92 | ||
93 | if (dma_info.cap == DMA_CYCLIC) { | ||
94 | dma_info.buf = pos; | ||
95 | prtd->params->ops->prepare(prtd->params->ch, &dma_info); | ||
96 | prtd->dma_loaded += limit; | ||
97 | return; | ||
98 | } | ||
99 | |||
93 | while (prtd->dma_loaded < limit) { | 100 | while (prtd->dma_loaded < limit) { |
94 | pr_debug("dma_loaded: %d\n", prtd->dma_loaded); | 101 | pr_debug("dma_loaded: %d\n", prtd->dma_loaded); |
95 | 102 | ||