diff options
| author | Alan Tull <r80115@freescale.com> | 2009-06-03 15:16:07 -0500 |
|---|---|---|
| committer | Alan Tull <r80115@freescale.com> | 2009-06-04 08:38:35 -0500 |
| commit | 8430caf4c920b235a1bd8789e8ba7a2094a4aa02 (patch) | |
| tree | c7d1e06d4f1d33a7dee41991f19caf0e405773ed /sound/soc/codecs | |
| parent | da8d286093f89d2d5e51dc06cde5a4a77dcaa948 (diff) | |
ENGR00112462 sgtl5000: don't mute adc in digital mute
sgtl5000_digital_mute() was muting the adc. This would result
in silence being recorded if record happened too soon after
a playback.
Signed-off-by: Alan Tull <r80115@freescale.com>
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/sgtl5000.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 577b701792fe..2618ae506763 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -397,13 +397,11 @@ static int sgtl5000_digital_mute(struct snd_soc_dai *codec_dai, int mute) if (mute) { reg1 |= SGTL5000_LINE_OUT_MUTE; reg1 |= SGTL5000_HP_MUTE; - reg1 |= SGTL5000_ADC_MUTE; reg2 |= SGTL5000_DAC_MUTE_LEFT; reg2 |= SGTL5000_DAC_MUTE_RIGHT; } else { reg1 &= ~SGTL5000_LINE_OUT_MUTE; reg1 &= ~SGTL5000_HP_MUTE; - reg1 &= ~SGTL5000_ADC_MUTE; reg2 &= ~SGTL5000_DAC_MUTE_LEFT; reg2 &= ~SGTL5000_DAC_MUTE_RIGHT; } @@ -950,7 +948,7 @@ static int sgtl5000_init(struct snd_soc_device *socdev) | (0xf << SGTL5000_ADC_VOL_RIGHT_SHIFT); sgtl5000_write(codec, SGTL5000_CHIP_ANA_ADC_CTRL, reg); - reg = SGTL5000_LINE_OUT_MUTE | SGTL5000_HP_MUTE | SGTL5000_ADC_MUTE; + reg = SGTL5000_LINE_OUT_MUTE | SGTL5000_HP_MUTE; sgtl5000_write(codec, SGTL5000_CHIP_ANA_CTRL, reg); sgtl5000_write(codec, SGTL5000_CHIP_MIC_CTRL, 0); |