summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJyri Sarha <jsarha@ti.com>2014-03-17 08:31:31 +0100
committerMark Brown <broonie@linaro.org>2014-03-17 14:16:59 +0100
commitfd218aa3e5d4ee522cbfe88ad4dd83eb891096fb (patch)
tree314b031f52b39240d0943fb75fdf64c5c48ba716
parentASoC: tlv320aic31xx: Staticise non-exported symbols (diff)
downloadlinux-fd218aa3e5d4ee522cbfe88ad4dd83eb891096fb.tar.xz
linux-fd218aa3e5d4ee522cbfe88ad4dd83eb891096fb.zip
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>
-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,
}
break;
case SND_SOC_BIAS_OFF:
- aic31xx_power_off(codec);
+ if (codec->dapm.bias_level == SND_SOC_BIAS_STANDBY)
+ aic31xx_power_off(codec);
break;
}
codec->dapm.bias_level = level;