diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-09-27 12:21:11 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-09-27 12:21:11 +0200 |
| commit | 60c9e3178f7dadc7442128d76c4753485e4e8385 (patch) | |
| tree | 1e00a5d28a3759ee7d62fadc00f6f907505e8964 /sound/soc | |
| parent | ASoC: twl6040: No need to change delay during HF ramp (diff) | |
| parent | ASoC: ssm2602: Re-enable oscillator after suspend (diff) | |
| download | linux-60c9e3178f7dadc7442128d76c4753485e4e8385.tar.xz linux-60c9e3178f7dadc7442128d76c4753485e4e8385.zip | |
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc')
| -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, 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: |