diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2015-11-10 08:39:17 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-11-10 20:02:02 +0100 |
| commit | 7115cb913d9e2d68583cf76578b32568bc8ea83f (patch) | |
| tree | 6d65a79fbc82a68ea51fbe030d604412968ba7c9 /sound/soc | |
| parent | Merge tag 'asoc-v4.3-rc6' into asoc-fix-rcar (diff) | |
| download | linux-7115cb913d9e2d68583cf76578b32568bc8ea83f.tar.xz linux-7115cb913d9e2d68583cf76578b32568bc8ea83f.zip | |
ASoC: rsnd: make sure SRC In Rate feature enablement
SRC In Rate convert feature cannot be used if data path is using DVC.
This patch judges it, and not allowed to use it in such case.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/sh/rcar/src.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c index 261b50217c48..68b439ed22d7 100644 --- a/sound/soc/sh/rcar/src.c +++ b/sound/soc/sh/rcar/src.c @@ -923,6 +923,7 @@ static int rsnd_src_pcm_new_gen2(struct rsnd_mod *mod, struct snd_soc_pcm_runtime *rtd) { struct rsnd_dai *rdai = rsnd_io_to_rdai(io); + struct rsnd_mod *dvc = rsnd_io_to_mod_dvc(io); struct rsnd_src *src = rsnd_mod_to_src(mod); int ret; @@ -937,6 +938,12 @@ static int rsnd_src_pcm_new_gen2(struct rsnd_mod *mod, return 0; /* + * SRC In doesn't work if DVC was enabled + */ + if (dvc && !rsnd_io_is_play(io)) + return 0; + + /* * enable sync convert */ ret = rsnd_kctrl_new_s(mod, io, rtd, |