diff options
| author | Mark Brown <broonie@kernel.org> | 2016-03-02 12:58:58 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-02 12:58:58 +0900 |
| commit | 79e24da00b1137031245f3341828e4215b1b5b59 (patch) | |
| tree | fbb921353aa48f5b26bc9cff4bfd5848010dae23 /sound/soc/sh/rcar/src.c | |
| parent | fd9adcfdc1434fdd4d0a14ddfe686449a6ffeeb3 (diff) | |
| parent | e6ef243fa4660f3206137bd5f3e69b13a9b7c28a (diff) | |
Merge branch 'topic/update-bits' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into asoc-rcar
Diffstat (limited to 'sound/soc/sh/rcar/src.c')
| -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 dab0954196b7..03c6314871ff 100644 --- a/sound/soc/sh/rcar/src.c +++ b/sound/soc/sh/rcar/src.c @@ -475,6 +475,7 @@ static int rsnd_src_pcm_new(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; @@ -489,6 +490,12 @@ static int rsnd_src_pcm_new(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, |