diff options
| -rw-r--r-- | include/sound/soc-dapm.h | 1 | ||||
| -rw-r--r-- | sound/soc/soc-core.c | 10 |
2 files changed, 2 insertions, 9 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 8d7416e46861..9e35203653ff 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h | |||
| @@ -586,7 +586,6 @@ struct snd_soc_dapm_update { | |||
| 586 | /* DAPM context */ | 586 | /* DAPM context */ |
| 587 | struct snd_soc_dapm_context { | 587 | struct snd_soc_dapm_context { |
| 588 | enum snd_soc_bias_level bias_level; | 588 | enum snd_soc_bias_level bias_level; |
| 589 | enum snd_soc_bias_level suspend_bias_level; | ||
| 590 | struct delayed_work delayed_work; | 589 | struct delayed_work delayed_work; |
| 591 | unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */ | 590 | unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */ |
| 592 | /* Go to BIAS_OFF in suspend if the DAPM context is idle */ | 591 | /* Go to BIAS_OFF in suspend if the DAPM context is idle */ |
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 30579ca5bacb..72601a86a748 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
| @@ -583,15 +583,9 @@ int snd_soc_suspend(struct device *dev) | |||
| 583 | cpu_dai->driver->suspend(cpu_dai); | 583 | cpu_dai->driver->suspend(cpu_dai); |
| 584 | } | 584 | } |
| 585 | 585 | ||
| 586 | /* close any waiting streams and save state */ | 586 | /* close any waiting streams */ |
| 587 | for (i = 0; i < card->num_rtd; i++) { | 587 | for (i = 0; i < card->num_rtd; i++) |
| 588 | struct snd_soc_dai **codec_dais = card->rtd[i].codec_dais; | ||
| 589 | flush_delayed_work(&card->rtd[i].delayed_work); | 588 | flush_delayed_work(&card->rtd[i].delayed_work); |
| 590 | for (j = 0; j < card->rtd[i].num_codecs; j++) { | ||
| 591 | codec_dais[j]->codec->dapm.suspend_bias_level = | ||
| 592 | codec_dais[j]->codec->dapm.bias_level; | ||
| 593 | } | ||
| 594 | } | ||
| 595 | 589 | ||
| 596 | for (i = 0; i < card->num_rtd; i++) { | 590 | for (i = 0; i < card->num_rtd; i++) { |
| 597 | 591 | ||
