commit 27b465b4d7b1666d4d8ade36646f101e07c1f624
author Linux Build Service Account <lnxbuild@localhost> Sat May 12 11:58:10 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Sat May 12 11:58:10 2012 -0700
tree 10709ed382ac5704383aeefdd94cbb4d2da0440a
parent 998fc7f82356fbb1906a97ffcb27936fff94e7a0
parent 630c5a45cbfe425f4dc81f217ed7d2a66fb79d98

Merge "ASoC: FM Playback and CS Voice call stops after power collapse" into msm-3.0

sound/soc/msm/apq8064.c

diff --git a/sound/soc/msm/apq8064.c b/sound/soc/msm/apq8064.c
index b3374fe..b0244af 100644
--- a/sound/soc/msm/apq8064.c
+++ b/sound/soc/msm/apq8064.c
@@ -1554,6 +1554,7 @@
 		.platform_name = "msm-pcm-hostless",
 		.codec_name = "tabla_codec",
 		.codec_dai_name = "tabla_tx2",
+		.ignore_suspend = 1,
 		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,
 		.ops = &msm_be_ops,
 	},

sound/soc/msm/msm8960.c

diff --git a/sound/soc/msm/msm8960.c b/sound/soc/msm/msm8960.c
index 40f81e8..f78f58d 100644
--- a/sound/soc/msm/msm8960.c
+++ b/sound/soc/msm/msm8960.c
@@ -1370,6 +1370,7 @@
 		.platform_name = "msm-pcm-hostless",
 		.codec_name = "tabla1x_codec",
 		.codec_dai_name = "tabla_tx2",
+		.ignore_suspend = 1,
 		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,
 		.ops = &msm8960_be_ops,
 	},
@@ -1410,6 +1411,7 @@
 		.platform_name = "msm-pcm-hostless",
 		.codec_name = "tabla_codec",
 		.codec_dai_name = "tabla_tx2",
+		.ignore_suspend = 1,
 		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,
 		.ops = &msm8960_be_ops,
 	},