diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-10-06 10:04:30 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-10-06 10:04:30 +0200 |
| commit | 97999e28c74c5908445735ac282e8b20deb67b81 (patch) | |
| tree | 0ede4ec09fd0133400df68a1f1509dea726dea36 /sound/soc/codecs/ssm2602.c | |
| parent | 06503670afc4372186d691ab2b9298a5e86fa29f (diff) | |
| parent | 798cb7e897210dbf827f69a302c0967e0380ebac (diff) | |
Merge branch 'fix/hda' into topic/hda
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 84f4ad568556..9801cd7cfcb5 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c @@ -431,7 +431,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: |