diff options
| author |   Mengdong Lin <mengdong.lin@linux.intel.com> | 2015-12-02 14:11:48 +0800 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2015-12-08 18:05:09 +0000 |
| commit | 61b0088b6a5b98608ce00c18a057b1f5bcb5f8b3 (patch) | |
| tree | e5ea3b0b1238cbd73b16a7237bb2fb76c5f3e8e6 /sound/soc/soc-core.c | |
| parent | ASoC: soc_bind_dai_link() directly returns success for a bound DAI link (diff) | |
| download | wireguard-linux-61b0088b6a5b98608ce00c18a057b1f5bcb5f8b3.tar.xz wireguard-linux-61b0088b6a5b98608ce00c18a057b1f5bcb5f8b3.zip | |
ASoC: Bind new DAI links after probing components
Probing components can bring new DAI or DAI links based on the topology
info. This patch finds the unbound DAI links and bind them.
Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 11d073b6ce33..6b1982dcedf1 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1806,6 +1806,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) { struct snd_soc_codec *codec; struct snd_soc_pcm_runtime *rtd; + struct snd_soc_dai_link *dai_link; int ret, i, order; mutex_lock(&client_mutex); @@ -1893,6 +1894,21 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) } } + /* Find new DAI links added during probing components and bind them. + * Components with topology may bring new DAIs and DAI links. + */ + list_for_each_entry(dai_link, &card->dai_link_list, list) { + if (soc_is_dai_link_bound(card, dai_link)) + continue; + + ret = soc_init_dai_link(card, dai_link); + if (ret) + goto probe_dai_err; + ret = soc_bind_dai_link(card, dai_link); + if (ret) + goto probe_dai_err; + } + /* probe all DAI links on this card */ for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; order++) { |