diff options
author | Xiang Xiao <xiaoxiang@xiaomi.com> | 2014-03-01 11:04:02 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-02 23:40:54 -0500 |
commit | 57996358f4d679b2bc39d4cd15166bb89fc8d981 (patch) | |
tree | 37eab28a27ed8b5e36bbe70f852113b711057c77 | |
parent | 26e24ddce755cd6fb4b05a87ae37f7e10faa0c4b (diff) |
ASoC: dapm: Power off all widgets in the snd_soc_dapm_shutdown
The widgets generated by the machine driver need to power off too.
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | sound/soc/soc-dapm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 4200f96a1483..d856e7c4c631 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c | |||
@@ -4116,7 +4116,7 @@ void snd_soc_dapm_free(struct snd_soc_dapm_context *dapm) | |||
4116 | } | 4116 | } |
4117 | EXPORT_SYMBOL_GPL(snd_soc_dapm_free); | 4117 | EXPORT_SYMBOL_GPL(snd_soc_dapm_free); |
4118 | 4118 | ||
4119 | static void soc_dapm_shutdown_codec(struct snd_soc_dapm_context *dapm) | 4119 | static void soc_dapm_shutdown_dapm(struct snd_soc_dapm_context *dapm) |
4120 | { | 4120 | { |
4121 | struct snd_soc_card *card = dapm->card; | 4121 | struct snd_soc_card *card = dapm->card; |
4122 | struct snd_soc_dapm_widget *w; | 4122 | struct snd_soc_dapm_widget *w; |
@@ -4156,12 +4156,12 @@ static void soc_dapm_shutdown_codec(struct snd_soc_dapm_context *dapm) | |||
4156 | */ | 4156 | */ |
4157 | void snd_soc_dapm_shutdown(struct snd_soc_card *card) | 4157 | void snd_soc_dapm_shutdown(struct snd_soc_card *card) |
4158 | { | 4158 | { |
4159 | struct snd_soc_codec *codec; | 4159 | struct snd_soc_dapm_context *dapm; |
4160 | 4160 | ||
4161 | list_for_each_entry(codec, &card->codec_dev_list, card_list) { | 4161 | list_for_each_entry(dapm, &card->dapm_list, list) { |
4162 | soc_dapm_shutdown_codec(&codec->dapm); | 4162 | soc_dapm_shutdown_dapm(dapm); |
4163 | if (codec->dapm.bias_level == SND_SOC_BIAS_STANDBY) | 4163 | if (dapm->bias_level == SND_SOC_BIAS_STANDBY) |
4164 | snd_soc_dapm_set_bias_level(&codec->dapm, | 4164 | snd_soc_dapm_set_bias_level(dapm, |
4165 | SND_SOC_BIAS_OFF); | 4165 | SND_SOC_BIAS_OFF); |
4166 | } | 4166 | } |
4167 | } | 4167 | } |