aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorJyri Sarha <jsarha@ti.com>2014-03-17 03:31:31 -0400
committerMark Brown <broonie@linaro.org>2014-03-17 09:16:59 -0400
commitfd218aa3e5d4ee522cbfe88ad4dd83eb891096fb (patch)
tree314b031f52b39240d0943fb75fdf64c5c48ba716 /sound
parent9296f4da3bafa23d8b9abc5cd271a66ea8f90cd2 (diff)
ASoC: tlv320aic31xx: Turn power off only once.
Regulator code keep count of enables and disables. Double disable causes an ugly warning. Signed-off-by: Jyri Sarha <jsarha@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/tlv320aic31xx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c
index d3517a919776..1f243c2c98fd 100644
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
@@ -1020,7 +1020,8 @@ static int aic31xx_set_bias_level(struct snd_soc_codec *codec,
1020 } 1020 }
1021 break; 1021 break;
1022 case SND_SOC_BIAS_OFF: 1022 case SND_SOC_BIAS_OFF:
1023 aic31xx_power_off(codec); 1023 if (codec->dapm.bias_level == SND_SOC_BIAS_STANDBY)
1024 aic31xx_power_off(codec);
1024 break; 1025 break;
1025 } 1026 }
1026 codec->dapm.bias_level = level; 1027 codec->dapm.bias_level = level;