Skip to content

Commit add2332

Browse files
morimotobroonie
authored andcommitted
ASoC: simple-card-utils: care simple_util_dai for dummy DAI
Simple Card Utils has simple_util_dai which is paired to snd_soc_dai, and assmus that CPU/Codec DAI and its paired simple_util_dai are same order for CPU/Codec simple_util_dai[0] <--> snd_soc_dai[0] simple_util_dai[1] <--> snd_soc_dai[1] ... So, it is using same index in for_each loop. (X) gets simple_util_dai (Y) gets snd_soc_dai (Y) for_each_rtd_cpu_dais(.., i, ..) { (X)(A) udai = simple_props_to_dai_cpu(.., i); } (X) for_each_prop_dai_cpu(.., i, ...) { (Y) dai = snd_soc_rtd_to_cpu(.., i); ... } But current Simple Card Utils didn't have simple_util_dai for dummy DAI. So above (A) will get NULL pointer in such case. This patch cares simple_util_dai for dummy DAI. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Link: https://patch.msgid.link/87msi5maz3.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent c853e96 commit add2332

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

sound/soc/generic/simple-card-utils.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -858,6 +858,10 @@ int simple_util_init_aux_jacks(struct simple_util_priv *priv, char *prefix)
858858
}
859859
EXPORT_SYMBOL_GPL(simple_util_init_aux_jacks);
860860

861+
static struct simple_util_dai dummy_util_dais = {
862+
.name = "dummy_util_dais",
863+
};
864+
861865
int simple_util_init_priv(struct simple_util_priv *priv,
862866
struct link_info *li)
863867
{
@@ -929,6 +933,7 @@ int simple_util_init_priv(struct simple_util_priv *priv,
929933
dai_link[i].cpus = &snd_soc_dummy_dlc;
930934
dai_props[i].num.cpus =
931935
dai_link[i].num_cpus = 1;
936+
dai_props[i].cpu_dai = &dummy_util_dais;
932937
}
933938

934939
if (li->num[i].codecs) {
@@ -951,6 +956,7 @@ int simple_util_init_priv(struct simple_util_priv *priv,
951956
dai_link[i].codecs = &snd_soc_dummy_dlc;
952957
dai_props[i].num.codecs =
953958
dai_link[i].num_codecs = 1;
959+
dai_props[i].codec_dai = &dummy_util_dais;
954960
}
955961

956962
if (li->num[i].platforms) {

0 commit comments

Comments
 (0)