diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-01-21 01:58:33 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-01-22 17:12:25 +0000 |
| commit | 355cb84fbe1f098f80c17dad9027ad2c6aec3fa0 (patch) | |
| tree | 948f2c374aa16da922943ddb774cc232dfb7e615 /sound/soc/sh/rcar/ssi.c | |
| parent | 5ba17b42e1755c3c5cfe96370cfd47f34d01f62c (diff) | |
ASoC: rsnd: attach Audio-DMAC-periperi correctly
SSI/SRC will try to attach DMAC as Audio-DMAC or Audio-DMAC-periperi.
It is fixed IP, but will be attached to each streams as different module
in case of MUX (= multi sound path will be merged).
This patch solves this issue.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sh/rcar/ssi.c')
| -rw-r--r-- | sound/soc/sh/rcar/ssi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index e68f3a1c9cb4..90674137aa90 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -704,9 +704,8 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod, if (ret) return ret; - ssi->dma = rsnd_dma_attach(io, mod, dma_id); - if (IS_ERR(ssi->dma)) - return PTR_ERR(ssi->dma); + /* SSI probe might be called many times in MUX multi path */ + ret = rsnd_dma_attach(io, mod, &ssi->dma, dma_id); return ret; } |