From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Mark Brown <broonie@kernel.org>
Cc: Linux-ALSA <alsa-devel@alsa-project.org>,
Simon <horms@verge.net.au>, Liam Girdwood <lgirdwood@gmail.com>
Subject: [PATCH 05/15] ASoC: rsnd: try to connect connected mod is not error
Date: Thu, 21 Jan 2016 01:56:36 +0000 [thread overview]
Message-ID: <87k2n34s1v.wl%kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87r3hb4s53.wl%kuninori.morimoto.gx@renesas.com>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
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>
---
sound/soc/sh/rcar/core.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 3eb7e9a..ad97ce3 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;
--
1.9.1
next prev parent reply other threads:[~2016-01-21 1:56 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-21 1:54 [PATCH 0/15] ASoC: rsnd: Ensure CTU/MUX works Kuninori Morimoto
2016-01-21 1:55 ` [PATCH 01/15] ASoC: rsnd: remove unsed *parent Kuninori Morimoto
2016-01-22 18:26 ` Applied "ASoC: rsnd: remove unsed *parent" to the asoc tree Mark Brown
2016-01-21 1:55 ` [PATCH 02/15] ASoC: rsnd: use rsnd_mod_init() for ADG Kuninori Morimoto
2016-01-22 18:26 ` Applied "ASoC: rsnd: use rsnd_mod_init() for ADG" to the asoc tree Mark Brown
2016-01-21 1:55 ` [PATCH 03/15] ASoC: rsnd: add debug message for rsnd_mod_call() Kuninori Morimoto
2016-01-22 18:26 ` Applied "ASoC: rsnd: add debug message for rsnd_mod_call()" to the asoc tree Mark Brown
2016-01-21 1:56 ` [PATCH 04/15] ASoC: rsnd: don't update status if rsnd_mod_call() doesn't match Kuninori Morimoto
2016-01-22 18:26 ` Applied "ASoC: rsnd: don't update status if rsnd_mod_call() doesn't match" to the asoc tree Mark Brown
2016-01-21 1:56 ` Kuninori Morimoto [this message]
2016-01-22 18:26 ` Applied "ASoC: rsnd: try to connect connected mod is not error" " Mark Brown
2016-01-21 1:56 ` [PATCH 06/15] ASoC: rsnd: always call probe/remove for MUX Kuninori Morimoto
2016-01-22 18:26 ` Applied "ASoC: rsnd: always call probe/remove for MUX" to the asoc tree Mark Brown
2016-01-21 1:57 ` [PATCH 07/15] ASoC: rsnd: don't overwrite io on rsnd_cmd_init() Kuninori Morimoto
2016-01-22 18:26 ` Applied "ASoC: rsnd: don't overwrite io on rsnd_cmd_init()" to the asoc tree Mark Brown
2016-01-21 1:57 ` [PATCH 08/15] ASoC: rsnd: select each SRC correctly for CMD data path Kuninori Morimoto
2016-01-22 18:26 ` Applied "ASoC: rsnd: select each SRC correctly for CMD data path" to the asoc tree Mark Brown
2016-01-21 1:58 ` [PATCH 09/15] ASoC: rsnd: each mod has status again for CTU/MUX support Kuninori Morimoto
2016-01-22 18:26 ` Applied "ASoC: rsnd: each mod has status again for CTU/MUX support" to the asoc tree Mark Brown
2016-01-21 1:58 ` [PATCH 10/15] ASoC: rsnd: attach Audio-DMAC-periperi correctly Kuninori Morimoto
2016-01-22 18:26 ` Applied "ASoC: rsnd: attach Audio-DMAC-periperi correctly" to the asoc tree Mark Brown
2016-01-21 1:58 ` [PATCH 11/15] ASoC: rsnd: ctu: add rsnd_mix_activation() Kuninori Morimoto
2016-01-22 18:26 ` Applied "ASoC: rsnd: ctu: add rsnd_mix_activation()" to the asoc tree Mark Brown
2016-01-21 1:59 ` [PATCH 12/15] ASoC: rsnd: ctu: add rsnd_ctu_halt() Kuninori Morimoto
2016-01-22 18:26 ` Applied "ASoC: rsnd: ctu: add rsnd_ctu_halt()" to the asoc tree Mark Brown
2016-01-21 1:59 ` [PATCH 13/15] ASoC: rsnd: ctu: settings matches to datasheet Kuninori Morimoto
2016-01-22 18:26 ` Applied "ASoC: rsnd: ctu: settings matches to datasheet" to the asoc tree Mark Brown
2016-01-21 1:59 ` [PATCH 14/15] ASoC: rsnd: tidyup Playback/Capture sequence Kuninori Morimoto
2016-01-22 18:26 ` Applied "ASoC: rsnd: tidyup Playback/Capture sequence" to the asoc tree Mark Brown
2016-01-21 2:00 ` [PATCH 15/15] ASoC: rsnd: disable SRC.out/in in same time Kuninori Morimoto
2016-01-22 18:26 ` Applied "ASoC: rsnd: disable SRC.out/in in same time" to the asoc tree Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87k2n34s1v.wl%kuninori.morimoto.gx@renesas.com \
--to=kuninori.morimoto.gx@renesas.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=horms@verge.net.au \
--cc=lgirdwood@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).