Unverified Commit cfe4585d authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: (SOF) topology: Regression fixes for next 

Merge series from Peter Ujfalusi <peter.ujfalusi@linux.intel.com>:

Today I came across two regressions in next with SOF:

The topology would not load with a failure of creating playback DAI
the first patch is fixing this which was caused by a missing 'else' in the patch

After fixing the topology loading, the module unloading caused kernel panic.
The second patch is correcting that which is I likely caused by copy-paste to
set wrong unload callback for the graph element.

With these patches applied SOF is working on next and modules can be unloaded
parents 96ebccb2 dd184c40

sound/soc/soc-topology.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

sound/soc/sof/topology.c

+1 −1
Original line number Diff line number Diff line
@@ -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;