diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-05-05 11:25:17 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-05-05 11:25:17 +0200 |
| commit | 20c76945d05e26dc24eabcfc2f61f3929590cc29 (patch) | |
| tree | 73238b71823f829413a51923df6179e7fd122ab6 /sound/soc/codecs/tlv320aic23.c | |
| parent | cff7873554eedc044029c41a9fd694245d97eff8 (diff) | |
| parent | 06412088ce98f745405b8f65cfc51ddd6b842bbf (diff) | |
| download | op-kernel-dev-20c76945d05e26dc24eabcfc2f61f3929590cc29.zip op-kernel-dev-20c76945d05e26dc24eabcfc2f61f3929590cc29.tar.gz | |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for 3.4
Nothing terribly exciting here, a bunch of small and simple fixes
scattered around the place.
Diffstat (limited to 'sound/soc/codecs/tlv320aic23.c')
| -rw-r--r-- | sound/soc/codecs/tlv320aic23.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c index 16d55f9..df1e07f 100644 --- a/sound/soc/codecs/tlv320aic23.c +++ b/sound/soc/codecs/tlv320aic23.c @@ -472,7 +472,7 @@ static int tlv320aic23_set_dai_sysclk(struct snd_soc_dai *codec_dai, static int tlv320aic23_set_bias_level(struct snd_soc_codec *codec, enum snd_soc_bias_level level) { - u16 reg = snd_soc_read(codec, TLV320AIC23_PWR) & 0xff7f; + u16 reg = snd_soc_read(codec, TLV320AIC23_PWR) & 0x17f; switch (level) { case SND_SOC_BIAS_ON: @@ -491,7 +491,7 @@ static int tlv320aic23_set_bias_level(struct snd_soc_codec *codec, case SND_SOC_BIAS_OFF: /* everything off, dac mute, inactive */ snd_soc_write(codec, TLV320AIC23_ACTIVE, 0x0); - snd_soc_write(codec, TLV320AIC23_PWR, 0xffff); + snd_soc_write(codec, TLV320AIC23_PWR, 0x1ff); break; } codec->dapm.bias_level = level; |
