2 files changed, 18 insertions, 2 deletions

diff --git a/arch/arm/plat-samsung/s3c-dma-ops.c b/arch/arm/plat-samsung/s3c-dma-ops.c
index 0cc40aea3f5a..98b10ba67dc7 100644
--- a/arch/arm/plat-samsung/s3c-dma-ops.c
+++ b/arch/arm/plat-samsung/s3c-dma-ops.c
@@ -82,7 +82,8 @@ static int s3c_dma_config(unsigned ch, struct samsung_dma_config *param)
 static int s3c_dma_prepare(unsigned ch, struct samsung_dma_prep *param)
 {
         struct cb_data *data;
-        int len = (param->cap == DMA_CYCLIC) ? param->period : param->len;
+        dma_addr_t pos = param->buf;
+        dma_addr_t end = param->buf + param->len;
 
         list_for_each_entry(data, &dma_list, node)
                 if (data->ch == ch)
@@ -94,7 +95,15 @@ static int s3c_dma_prepare(unsigned ch, struct samsung_dma_prep *param)
                 data->fp_param = param->fp_param;
         }
 
-        s3c2410_dma_enqueue(ch, (void *)data, param->buf, len);
+        if (param->cap != DMA_CYCLIC) {
+                s3c2410_dma_enqueue(ch, (void *)data, param->buf, param->len);
+                return 0;
+        }
+
+        while (pos < end) {
+                s3c2410_dma_enqueue(ch, (void *)data, pos, param->period);
+                pos += param->period;
+        }
 
         return 0;
 }
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)
         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);