[RESEND] ASoC: soc-pcm.c: Complete the active count for components without DAIs

Commit Message

Chancel Liu Dec. 14, 2023, 2:34 a.m. UTC

Some components like platforms don't have DAIs. If the active count of
these components is ignored pinctrl may be wrongly selected between
default and sleep state. So need to increment or decrement the active
count for components without DAIs to avoid it.

Signed-off-by: Chancel Liu <[e-mail]>
---
Add [e-mail] in RESEND. No other changes.

 sound/soc/soc-pcm.c | 8 ++++++++
 1 file changed, 8 insertions(+)

--
2.42.0

Patch

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index efde4203bbf7..7dd4d41f680a 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -292,6 +292,7 @@  static void dpcm_set_be_update_state(struct snd_soc_pcm_runtime *be,
 void snd_soc_runtime_action(struct snd_soc_pcm_runtime *rtd,
 			    int stream, int action)
 {
+	struct snd_soc_component *component;
 	struct snd_soc_dai *dai;
 	int i;

@@ -299,6 +300,13 @@  void snd_soc_runtime_action(struct snd_soc_pcm_runtime *rtd,

 	for_each_rtd_dais(rtd, i, dai)
 		snd_soc_dai_action(dai, stream, action);
+
+	/* Increments/Decrements the active count for components without DAIs */
+	for_each_rtd_components(rtd, i, component) {
+		if (component->num_dai)
+			continue;
+		component->active += action;
+	}
 }
 EXPORT_SYMBOL_GPL(snd_soc_runtime_action);