summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorPhil Edworthy <phil.edworthy@renesas.com>2013-10-31 23:06:17 -0700
committerBen Hutchings <ben@decadent.org.uk>2014-01-03 04:33:16 +0000
commitba3aaf91e684c9ed669300af5054b7ea14708ce7 (patch)
tree28a1952f7425f4c0c2a94073d8da818a2eaacd23 /sound
parent67e2113ded5fe78bfe352a3fb21446cf790ce6b0 (diff)
ASoC: ak4642: prevent un-necessary changes to SG_SL1
commit 7b5bfb82882b9b1c8423ce0ed6852ca3762d967a upstream. If you record the sound during playback, the playback sound becomes silent. Modify so that the codec driver does not clear SG_SL1::DACL bit which is controlled under widget Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@linaro.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/ak4642.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
index 1c4999d1758b..f2dac5cdd670 100644
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
@@ -214,7 +214,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, PMVCM | PMADL,