Browse Source

Merge "asoc: add ignore_suspend for all BEs, BE_OUT and BE_IN"

qctecmdr 5 years ago
parent
commit
935e9bdbd0
2 changed files with 4 additions and 0 deletions
  1. 2 0
      asoc/msm-dai-q6-v2.c
  2. 2 0
      asoc/msm-pcm-routing-v2.c

+ 2 - 0
asoc/msm-dai-q6-v2.c

@@ -802,6 +802,7 @@ static int msm_dai_q6_dai_add_route(struct snd_soc_dai *dai)
 		dev_dbg(dai->dev, "%s: src %s sink %s\n",
 				__func__, intercon.source, intercon.sink);
 		snd_soc_dapm_add_routes(dapm, &intercon, 1);
+		snd_soc_dapm_ignore_suspend(dapm, intercon.sink);
 	}
 	if (dai->driver->capture.stream_name &&
 		dai->driver->capture.aif_name) {
@@ -812,6 +813,7 @@ static int msm_dai_q6_dai_add_route(struct snd_soc_dai *dai)
 		dev_dbg(dai->dev, "%s: src %s sink %s\n",
 				__func__, intercon.source, intercon.sink);
 		snd_soc_dapm_add_routes(dapm, &intercon, 1);
+		snd_soc_dapm_ignore_suspend(dapm, intercon.source);
 	}
 	return 0;
 }

+ 2 - 0
asoc/msm-pcm-routing-v2.c

@@ -27128,6 +27128,8 @@ static int msm_routing_probe(struct snd_soc_component *component)
 {
 	snd_soc_dapm_new_controls(&component->dapm, msm_qdsp6_widgets,
 			   ARRAY_SIZE(msm_qdsp6_widgets));
+	snd_soc_dapm_ignore_suspend(&component->dapm, "BE_OUT");
+	snd_soc_dapm_ignore_suspend(&component->dapm, "BE_IN");
 	snd_soc_dapm_add_routes(&component->dapm, intercon,
 		ARRAY_SIZE(intercon));