diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-09-27 06:21:11 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-09-27 06:21:11 -0400 |
| commit | 60c9e3178f7dadc7442128d76c4753485e4e8385 (patch) | |
| tree | 1e00a5d28a3759ee7d62fadc00f6f907505e8964 /sound/soc/codecs/ssm2602.c | |
| parent | 4d64bdca4485da8d2e604c2b02f3f32c9f468a28 (diff) | |
| parent | 9058020cd9ae3423d6fe7de591698dc96b6701aa (diff) | |
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc/codecs/ssm2602.c')
| -rw-r--r-- | sound/soc/codecs/ssm2602.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index cceb0022f02c..32d6c5141860 100644 --- 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, | |||
| 430 | static int ssm2602_set_bias_level(struct snd_soc_codec *codec, | 430 | static int ssm2602_set_bias_level(struct snd_soc_codec *codec, |
| 431 | enum snd_soc_bias_level level) | 431 | enum snd_soc_bias_level level) |
| 432 | { | 432 | { |
| 433 | u16 reg = snd_soc_read(codec, SSM2602_PWR) & 0xff7f; | 433 | u16 reg = snd_soc_read(codec, SSM2602_PWR); |
| 434 | reg &= ~(PWR_POWER_OFF | PWR_OSC_PDN); | ||
| 434 | 435 | ||
| 435 | switch (level) { | 436 | switch (level) { |
| 436 | case SND_SOC_BIAS_ON: | 437 | case SND_SOC_BIAS_ON: |