Merge branch 'for-3.1' into for-3.2

git-mirror · Sep 27, 2011 · 60c9e31 · 60c9e31
2 parents 4d64bdc + 9058020
commit 60c9e31
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/sound/soc/codecs/ssm2602.c b/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: