summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@nokia.com>2010-05-17 13:21:46 +0200
committerLiam Girdwood <lrg@slimlogic.co.uk>2010-05-17 21:34:15 +0200
commit2d4cdd6fc974716555fcbaf7ec1d4dda22784c1b (patch)
treec49219ad57135d6722142c54f18fd79f7cc5bc2f /sound/soc
parentASoC: tlv320dac33: Use dev_dbg in dac33_hard_power function (diff)
downloadlinux-2d4cdd6fc974716555fcbaf7ec1d4dda22784c1b.tar.xz
linux-2d4cdd6fc974716555fcbaf7ec1d4dda22784c1b.zip
ASoC: tlv320dac33: Avoid powering off while in BIAS_OFF
Avoid calling the dac33_hard_power when the codec was already in BIAS_OFF state. This could happen in device suspend and module removal time. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/tlv320dac33.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c
index ad1795a83acb..bcf6d934499a 100644
--- a/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
@@ -589,6 +589,9 @@ static int dac33_set_bias_level(struct snd_soc_codec *codec,
}
break;
case SND_SOC_BIAS_OFF:
+ /* Do not power off, when the codec is already off */
+ if (codec->bias_level == SND_SOC_BIAS_OFF)
+ return 0;
ret = dac33_hard_power(codec, 0);
if (ret != 0)
return ret;