Merge branch 'for-3.1' into for-3.2

60c9e317 · Mark Brown · 4d64bdca · 9058020c · 60c9e317
Commit 60c9e317 authored Sep 27, 2011 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sound/soc/codecs/ssm2602.c sound/soc/codecs/ssm2602.c +2 -1

No files found.
--- 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: