commit 0b65fe618b1c7fc0d8c8fe18b024354a96d6e544
author Linux Build Service Account <lnxbuild@localhost> Mon Apr 03 18:14:43 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Apr 03 18:14:43 2017 -0700
tree f218d02d3c4eb3d9ae4e33795864e10189e95b43
parent 948697b27521fd6dd4371a22e214d9d65be52fe1
parent 4bfa8d0224a607a829e5f956c5aed1f61fb6baac

Merge "ASoC: msm8998: enable ignore suspend flag for ANC" into msm-4.9

sound/soc/msm/msm8998.c

diff --git a/sound/soc/msm/msm8998.c b/sound/soc/msm/msm8998.c
index 09d7ffa..ac31ca3 100644
--- a/sound/soc/msm/msm8998.c
+++ b/sound/soc/msm/msm8998.c
@@ -3381,12 +3381,12 @@ static int msm_audrx_init(struct snd_soc_pcm_runtime *rtd)
 	snd_soc_dapm_ignore_suspend(dapm, "HPHR");
 	snd_soc_dapm_ignore_suspend(dapm, "AIF4 VI");
 	snd_soc_dapm_ignore_suspend(dapm, "VIINPUT");
+	snd_soc_dapm_ignore_suspend(dapm, "ANC HPHL");
+	snd_soc_dapm_ignore_suspend(dapm, "ANC HPHR");
 
 	if (!strcmp(dev_name(codec_dai->dev), "tasha_codec")) {
 		snd_soc_dapm_ignore_suspend(dapm, "LINEOUT3");
 		snd_soc_dapm_ignore_suspend(dapm, "LINEOUT4");
-		snd_soc_dapm_ignore_suspend(dapm, "ANC HPHL");
-		snd_soc_dapm_ignore_suspend(dapm, "ANC HPHR");
 		snd_soc_dapm_ignore_suspend(dapm, "ANC LINEOUT1");
 		snd_soc_dapm_ignore_suspend(dapm, "ANC LINEOUT2");
 	}