diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-12-17 13:09:42 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-12-17 13:09:42 -0500 |
| commit | 5af7f998909e5c73649a9f96cf2d4ace6affbaa5 (patch) | |
| tree | 988bde645dfda5e314d99b03acc6fd3c0885f229 /sound/soc/codecs/ak4642.c | |
| parent | 97e7e161945d7fa1c3641d6c2f7ec1e7ef7d2eb8 (diff) | |
| parent | 108dd62e1e27b41c93fb30f8005552cf1dd2059c (diff) | |
Merge tag 'v3.8.13.14' into v3.8-rt
v3.8.13.14
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 1f0cdab03294..1e09512490df 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c @@ -256,7 +256,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); |