ASoC: fsi: use dmaengine_prep_dma_cyclic() for DMA transfer

[deliverable/linux.git] / sound / soc / sh / rcar / core.c

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 91880156e1ae0d9b33436455763cf84efcd4a127..7f68b33dcbbbfe2a482ba3e992edc4d59c3aafa5 100644 (file)
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -297,7 +297,6 @@ static void rsnd_dma_of_name(struct rsnd_dma *dma,
        for (i = 1; i < MOD_MAX; i++) {
                if (!src) {
                        mod[i] = ssi;
-                       break;
                } else if (!dvc) {
                        mod[i] = src;
                        src = NULL;
@@ -308,6 +307,9 @@ static void rsnd_dma_of_name(struct rsnd_dma *dma,
 
                if (mod[i] == this)
                        index = i;
+
+               if (mod[i] == ssi)
+                       break;
        }
 
        if (is_play) {
@@ -315,7 +317,7 @@ static void rsnd_dma_of_name(struct rsnd_dma *dma,
                dst_mod = mod[index];
        } else {
                src_mod = mod[index];
-               dst_mod = mod[index + 1];
+               dst_mod = mod[index - 1];
        }
 
        index = 0;
@@ -363,7 +365,7 @@ int rsnd_dma_init(struct rsnd_priv *priv, struct rsnd_dma *dma,
        if (ret < 0)
                goto rsnd_dma_init_err;
 
-       dma->dir = is_play ? DMA_TO_DEVICE : DMA_FROM_DEVICE;
+       dma->dir = is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;
        INIT_WORK(&dma->work, rsnd_dma_do_work);
 
        return 0;