From bcf82abd71f70caa17dafbfdec35e4d94a6d3dea Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 27 Sep 2011 11:21:11 +0100
Subject: [PATCH] --- yaml --- r: 270678 b: refs/heads/master c:
 60c9e3178f7dadc7442128d76c4753485e4e8385 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9ee61a869256..d2ee9e294482 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d64bdca4485da8d2e604c2b02f3f32c9f468a28
+refs/heads/master: 60c9e3178f7dadc7442128d76c4753485e4e8385
diff --git a/trunk/sound/soc/codecs/ssm2602.c b/trunk/sound/soc/codecs/ssm2602.c
index cceb0022f02c..32d6c5141860 100644
--- a/trunk/sound/soc/codecs/ssm2602.c
+++ b/trunk/sound/soc/codecs/ssm2602.c
@@ -430,7 +430,8 @@ static int ssm2602_set_dai_fmt(struct snd_soc_dai *codec_dai,
 static int ssm2602_set_bias_level(struct snd_soc_codec *codec,
 				 enum snd_soc_bias_level level)
 {
-	u16 reg = snd_soc_read(codec, SSM2602_PWR) & 0xff7f;
+	u16 reg = snd_soc_read(codec, SSM2602_PWR);
+	reg &= ~(PWR_POWER_OFF | PWR_OSC_PDN);
 
 	switch (level) {
 	case SND_SOC_BIAS_ON: