diff options
| author | Mike Marshall <hubcap@omnibond.com> | 2016-01-15 14:22:14 -0500 |
|---|---|---|
| committer | Mike Marshall <hubcap@omnibond.com> | 2016-01-15 14:22:14 -0500 |
| commit | 5e1f3938f9e4ef539031d639879cb1cea870fab5 (patch) | |
| tree | b262a7c002b05b7bc800a106d6ca6777dabe15bf /sound/soc/sh/rcar/src.c | |
| parent | 1808f8cc6cb2842c53147eccfd5e88044d0d22a6 (diff) | |
| parent | afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc (diff) | |
| download | linux-rpi-5e1f3938f9e4ef539031d639879cb1cea870fab5.tar.gz linux-rpi-5e1f3938f9e4ef539031d639879cb1cea870fab5.tar.bz2 linux-rpi-5e1f3938f9e4ef539031d639879cb1cea870fab5.zip | |
Orangefs: merge with V4.4
Merge tag 'v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into current
Linux 4.4
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 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, |