ASoC: Intel: avs: Update hda component teardown sequences

crojewsk-intel · broonie · commit e3146775f05d · 2025-01-09T12:14:20.000Z
If case of failure cleanup recently created DAI and while at it, adjust the remove() operation to match operation order of the probe() function. Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> Link: https://patch.msgid.link/20250109122216.3667847-6-cezary.rojewski@intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
diff --git a/sound/soc/intel/avs/pcm.c b/sound/soc/intel/avs/pcm.c
@@ -1564,6 +1564,7 @@ static int avs_component_hda_probe(struct snd_soc_component *component)
 		if (ret < 0) {
 			dev_err(component->dev, "create widgets failed: %d\n",
 				ret);
+			snd_soc_unregister_dai(dai);
 			goto exit;
 		}
 	}
@@ -1578,8 +1579,8 @@ static int avs_component_hda_probe(struct snd_soc_component *component)
 
 static void avs_component_hda_remove(struct snd_soc_component *component)
 {
-	avs_component_hda_unregister_dais(component);
 	avs_component_remove(component);
+	avs_component_hda_unregister_dais(component);
 }
 
 static int avs_component_hda_open(struct snd_soc_component *component,

Original file line number	Diff line number	Diff line change
`@@ -1564,6 +1564,7 @@ static int avs_component_hda_probe(struct snd_soc_component *component)`
`1564`	`1564`	`if (ret < 0) {`
`1565`	`1565`	`dev_err(component->dev, "create widgets failed: %d\n",`
`1566`	`1566`	`ret);`
	`1567`	`+ snd_soc_unregister_dai(dai);`
`1567`	`1568`	`goto exit;`
`1568`	`1569`	`}`
`1569`	`1570`	`}`
`@@ -1578,8 +1579,8 @@ static int avs_component_hda_probe(struct snd_soc_component *component)`
`1578`	`1579`
`1579`	`1580`	`static void avs_component_hda_remove(struct snd_soc_component *component)`
`1580`	`1581`	`{`
`1581`		`- avs_component_hda_unregister_dais(component);`
`1582`	`1582`	`avs_component_remove(component);`
	`1583`	`+ avs_component_hda_unregister_dais(component);`
`1583`	`1584`	`}`
`1584`	`1585`
`1585`	`1586`	`static int avs_component_hda_open(struct snd_soc_component *component,`