Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

+2 -2
+1 -1
sound/soc/soc-topology.c
··· 1081 1081 /* add route dobj to dobj_list */ 1082 1082 route->dobj.type = SND_SOC_DOBJ_GRAPH; 1083 1083 if (tplg->ops) 1084 - route->dobj.unload = tplg->ops->control_unload; 1084 + route->dobj.unload = tplg->ops->dapm_route_unload; 1085 1085 route->dobj.index = tplg->index; 1086 1086 list_add(&route->dobj.list, &tplg->comp->dobj_list); 1087 1087
+1 -1
sound/soc/sof/topology.c
··· 1065 1065 1066 1066 if (w->id == snd_soc_dapm_dai_out) 1067 1067 stream = SNDRV_PCM_STREAM_CAPTURE; 1068 - if (w->id == snd_soc_dapm_dai_in) 1068 + else if (w->id == snd_soc_dapm_dai_in) 1069 1069 stream = SNDRV_PCM_STREAM_PLAYBACK; 1070 1070 else 1071 1071 goto end;