summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-10 16:04:46 +0100
committerMark Brown <broonie@kernel.org>2015-04-10 16:04:46 +0100
commit5f97a4bd2c92aff216581d662a37163881ac3888 (patch)
tree0e6fea7c81c70da558a2064f7f97da293f63c3f1 /sound/soc/soc-core.c
parent6553bf06a369683408895b87e5172aa99a9266bd (diff)
parent7c0e3facf39a68f30c2eae69e969918eca1ff9d6 (diff)
downloadop-kernel-dev-5f97a4bd2c92aff216581d662a37163881ac3888.zip
op-kernel-dev-5f97a4bd2c92aff216581d662a37163881ac3888.tar.gz
Merge branch 'topic/delay' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-core
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 9dfa2e2..492e197 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -638,15 +638,9 @@ int snd_soc_suspend(struct device *dev)
cpu_dai->driver->suspend(cpu_dai);
}
- /* close any waiting streams and save state */
- for (i = 0; i < card->num_rtd; i++) {
- struct snd_soc_dai **codec_dais = card->rtd[i].codec_dais;
+ /* close any waiting streams */
+ for (i = 0; i < card->num_rtd; i++)
flush_delayed_work(&card->rtd[i].delayed_work);
- for (j = 0; j < card->rtd[i].num_codecs; j++) {
- codec_dais[j]->codec->dapm.suspend_bias_level =
- codec_dais[j]->codec->dapm.bias_level;
- }
- }
for (i = 0; i < card->num_rtd; i++) {
OpenPOWER on IntegriCloud