diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-10 17:04:46 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-10 17:04:46 +0200 |
| commit | 5f97a4bd2c92aff216581d662a37163881ac3888 (patch) | |
| tree | 0e6fea7c81c70da558a2064f7f97da293f63c3f1 /sound/soc/soc-core.c | |
| parent | ASoC: Don't try to register debugfs entries if the parent does not exist (diff) | |
| parent | ASoC: dapm: Remove delayed_work from dapm context struct (diff) | |
| download | linux-5f97a4bd2c92aff216581d662a37163881ac3888.tar.xz linux-5f97a4bd2c92aff216581d662a37163881ac3888.zip | |
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.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 9dfa2e241865..492e1976aab7 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++) { |