diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-03 22:04:05 -0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-03 22:04:05 -0800 |
| commit | ca89bc248e2fac44d6374a48b8d38b068c7a1bdf (patch) | |
| tree | 0c10af2a5f22a1ad0283023d403022ce6b84ebc4 /sound/soc/codecs/ak4642.c | |
| parent | 9645083ca5ef365b7b750cf219bb20b61bb925f8 (diff) | |
| parent | 7b5bfb82882b9b1c8423ce0ed6852ca3762d967a (diff) | |
| download | linux-ca89bc248e2fac44d6374a48b8d38b068c7a1bdf.tar.bz2 | |
Merge remote-tracking branch 'asoc/fix/ak4642' into asoc-linus
Diffstat (limited to 'sound/soc/codecs/ak4642.c')
| -rw-r--r-- | sound/soc/codecs/ak4642.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c index 21c35ed778cc..090d499bb7eb 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c @@ -257,7 +257,7 @@ static int ak4642_dai_startup(struct snd_pcm_substream *substream, * This operation came from example code of * "ASAHI KASEI AK4642" (japanese) manual p94. */ - snd_soc_write(codec, SG_SL1, PMMP | MGAIN0); + snd_soc_update_bits(codec, SG_SL1, PMMP | MGAIN0, PMMP | MGAIN0); snd_soc_write(codec, TIMER, ZTM(0x3) | WTM(0x3)); snd_soc_write(codec, ALC_CTL1, ALC | LMTH0); snd_soc_update_bits(codec, PW_MGMT1, PMADL, PMADL); |