diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-28 14:41:15 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-28 14:41:15 +0100 |
| commit | 6f2a06cd42336c75c74181730a7c31c78e2be6fb (patch) | |
| tree | 66a6edfdb019c5c4d14de10d20b70d57be9fd048 /sound/soc/sh/rcar/core.c | |
| parent | cd7bcc6000165f6215d15e2e32b58a646e5de5ec (diff) | |
| parent | c08c3b088053cec1465051258844e7934d3e3e37 (diff) | |
Merge remote-tracking branch 'asoc/fix/rcar' into asoc-rcar
Diffstat (limited to 'sound/soc/sh/rcar/core.c')
| -rw-r--r-- | sound/soc/sh/rcar/core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 7bdda8fbde87..7f68b33dcbbb 100644 --- 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; |