From afd7c141c750f3f043c755bd8d01a2ffee7e95b2 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Wed, 1 Feb 2023 13:28:45 +0200 Subject: ASoC: SOF: topology: Add missed "else" in sof_connect_dai_widget The conversion to use generic helpers missed the else for the dai direction check which leads to failure when loading playback widgets Fixes: 323f09a61d43 ("ASoC: sof: use helper function") Signed-off-by: Peter Ujfalusi Acked-by: Kuninori Morimoto Link: https://lore.kernel.org/r/20230201112846.27707-2-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown --- sound/soc/sof/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index 3cfdf782afca..4a62ccc71fcb 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -1065,7 +1065,7 @@ static int sof_connect_dai_widget(struct snd_soc_component *scomp, if (w->id == snd_soc_dapm_dai_out) stream = SNDRV_PCM_STREAM_CAPTURE; - if (w->id == snd_soc_dapm_dai_in) + else if (w->id == snd_soc_dapm_dai_in) stream = SNDRV_PCM_STREAM_PLAYBACK; else goto end; -- cgit v1.2.3 From dd184c400e10295631e5742fc7318ba071c67007 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Wed, 1 Feb 2023 13:28:46 +0200 Subject: ASoC: topology: Set correct unload callback for graph type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using the control_unload for graph type of elem will lead surprises on module unload. The correct callback to use is the dapm_route_unload. Fixes: 31e9273912bf ("ASoC: topology: Use unload() op directly") Signed-off-by: Peter Ujfalusi Reviewed-by: Amadeusz Sławiński Link: https://lore.kernel.org/r/20230201112846.27707-3-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown --- sound/soc/soc-topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index caf547816ea7..78223603088e 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1081,7 +1081,7 @@ static int soc_tplg_dapm_graph_elems_load(struct soc_tplg *tplg, /* add route dobj to dobj_list */ route->dobj.type = SND_SOC_DOBJ_GRAPH; if (tplg->ops) - route->dobj.unload = tplg->ops->control_unload; + route->dobj.unload = tplg->ops->dapm_route_unload; route->dobj.index = tplg->index; list_add(&route->dobj.list, &tplg->comp->dobj_list); -- cgit v1.2.3