diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-10 12:22:17 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-10 12:22:17 +0000 |
| commit | fd2eab87a2fcf0f42e21df85a2a4cd18b30f813e (patch) | |
| tree | 84485ed7d59e69e8a980b0d1f7c7175c6847fb57 /sound | |
| parent | 87fee06c5b3a04289115aa5c77a9dd59f81d0817 (diff) | |
| parent | b50684da6cd5a9ec47ea5556bc9f5461c1d7017c (diff) | |
| download | linux-3.10-fd2eab87a2fcf0f42e21df85a2a4cd18b30f813e.tar.gz linux-3.10-fd2eab87a2fcf0f42e21df85a2a4cd18b30f813e.tar.bz2 linux-3.10-fd2eab87a2fcf0f42e21df85a2a4cd18b30f813e.zip | |
Merge remote-tracking branch 'asoc/fix/sgtl5000' into tmp
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/sgtl5000.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index cb1675cd8e1..92bbfec9b10 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -401,7 +401,7 @@ static const struct snd_kcontrol_new sgtl5000_snd_controls[] = { 5, 1, 0), SOC_SINGLE_TLV("Mic Volume", SGTL5000_CHIP_MIC_CTRL, - 0, 4, 0, mic_gain_tlv), + 0, 3, 0, mic_gain_tlv), }; /* mute the codec used by alsa core */ @@ -1344,7 +1344,7 @@ static int sgtl5000_probe(struct snd_soc_codec *codec) SGTL5000_HP_ZCD_EN | SGTL5000_ADC_ZCD_EN); - snd_soc_write(codec, SGTL5000_CHIP_MIC_CTRL, 0); + snd_soc_write(codec, SGTL5000_CHIP_MIC_CTRL, 2); /* * disable DAP |