From a913904e25dd62f51aeac0e2a4843c02d1006a17 Mon Sep 17 00:00:00 2001
From: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Date: Wed, 26 May 2010 11:38:15 +0300
Subject: [PATCH] --- yaml --- r: 206498 b: refs/heads/master c:
 cbd2db128f2cbec1a70aa6897cc4cddbbadecbf6 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/sound/soc/codecs/twl4030.c | 13 ++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 4284f0552393..7cf9dfa39a22 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33f92ed4b3b9bef2080032b2b5d5dfba189eabeb
+refs/heads/master: cbd2db128f2cbec1a70aa6897cc4cddbbadecbf6
diff --git a/trunk/sound/soc/codecs/twl4030.c b/trunk/sound/soc/codecs/twl4030.c
index 9a3e999b595c..1e0aba5b2c5d 100644
--- a/trunk/sound/soc/codecs/twl4030.c
+++ b/trunk/sound/soc/codecs/twl4030.c
@@ -319,15 +319,6 @@ static void twl4030_power_up(struct snd_soc_codec *codec)
 	twl4030_codec_enable(codec, 1);
 }
 
-/*
- * Unconditional power down
- */
-static void twl4030_power_down(struct snd_soc_codec *codec)
-{
-	/* power down */
-	twl4030_codec_enable(codec, 0);
-}
-
 /* Earpiece */
 static const struct snd_kcontrol_new twl4030_dapm_earpiece_controls[] = {
 	SOC_DAPM_SINGLE("Voice", TWL4030_REG_EAR_CTL, 0, 1, 0),
@@ -1607,7 +1598,7 @@ static int twl4030_set_bias_level(struct snd_soc_codec *codec,
 			twl4030_power_up(codec);
 		break;
 	case SND_SOC_BIAS_OFF:
-		twl4030_power_down(codec);
+		twl4030_codec_enable(codec, 0);
 		break;
 	}
 	codec->bias_level = level;
@@ -2321,7 +2312,7 @@ static int __devinit twl4030_codec_probe(struct platform_device *pdev)
 	return 0;
 
 error_codec:
-	twl4030_power_down(codec);
+	twl4030_codec_enable(codec, 0);
 	kfree(codec->reg_cache);
 error_cache:
 	kfree(twl4030);