diff options
author | Peter Ujfalusi <peter.ujfalusi@nokia.com> | 2010-05-17 07:21:46 -0400 |
---|---|---|
committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-05-17 15:34:15 -0400 |
commit | 2d4cdd6fc974716555fcbaf7ec1d4dda22784c1b (patch) | |
tree | c49219ad57135d6722142c54f18fd79f7cc5bc2f /sound/soc | |
parent | 7fd1d74bfc0ecf3dfa139b47daa7941841724886 (diff) |
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.c | 3 |
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, | |||
589 | } | 589 | } |
590 | break; | 590 | break; |
591 | case SND_SOC_BIAS_OFF: | 591 | case SND_SOC_BIAS_OFF: |
592 | /* Do not power off, when the codec is already off */ | ||
593 | if (codec->bias_level == SND_SOC_BIAS_OFF) | ||
594 | return 0; | ||
592 | ret = dac33_hard_power(codec, 0); | 595 | ret = dac33_hard_power(codec, 0); |
593 | if (ret != 0) | 596 | if (ret != 0) |
594 | return ret; | 597 | return ret; |