summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorKuninori Morimoto2016-01-21 02:56:36 +0100
committerMark Brown2016-01-22 18:12:25 +0100
commitbfa3119c38afb8177f8e403b9e9b2ecd0306bb26 (patch)
treed3dee5bda84ab813a5815cca319dd2da81447aa6 /sound/soc
parentASoC: rsnd: don't update status if rsnd_mod_call() doesn't match (diff)
downloadkernel-qcow2-linux-bfa3119c38afb8177f8e403b9e9b2ecd0306bb26.tar.gz
kernel-qcow2-linux-bfa3119c38afb8177f8e403b9e9b2ecd0306bb26.tar.xz
kernel-qcow2-linux-bfa3119c38afb8177f8e403b9e9b2ecd0306bb26.zip
ASoC: rsnd: try to connect connected mod is not error
If system uses CTU/MUX, CTU/MUX/DVC will try to connect same CMD to system, but it is not error in this 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/core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 3eb7e9a7b5dc..ad97ce3ae844 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -369,6 +369,9 @@ int rsnd_dai_connect(struct rsnd_mod *mod,
if (!mod)
return -EIO;
+ if (io->mod[type] == mod)
+ return 0;
+
if (io->mod[type])
return -EINVAL;