From f7157c343344907e3f30e60655c74779d8bd9ce0 Mon Sep 17 00:00:00 2001
From: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Date: Mon, 17 May 2010 14:21:46 +0300
Subject: [PATCH] --- yaml --- r: 193472 b: refs/heads/master c:
 2d4cdd6fc974716555fcbaf7ec1d4dda22784c1b h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/sound/soc/codecs/tlv320dac33.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fd6390f7ceda..7c5607479942 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fd1d74bfc0ecf3dfa139b47daa7941841724886
+refs/heads/master: 2d4cdd6fc974716555fcbaf7ec1d4dda22784c1b
diff --git a/trunk/sound/soc/codecs/tlv320dac33.c b/trunk/sound/soc/codecs/tlv320dac33.c
index ad1795a83acb..bcf6d934499a 100644
--- a/trunk/sound/soc/codecs/tlv320dac33.c
+++ b/trunk/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;