summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-10-06 22:29:47 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-10-06 22:29:47 +0400
commit6f775ba0154cdf10108071acc71f26c4efdb8d57 (patch)
tree995091e27245987f1bcfdcd695de3a52d882823b /sound/soc
parentb266002abf6dfa4b358fdb5495f09e350b296552 (diff)
parent5b7dde346881b12246669ae97b3a2793c27b32b6 (diff)
downloadlinux-6f775ba0154cdf10108071acc71f26c4efdb8d57.tar.xz
Merge branch 'upstream/wm8350' into for-2.6.32
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm8350.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index 3ff0373dff89..593d5b9c9f03 100644
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -579,7 +579,7 @@ static const struct snd_kcontrol_new wm8350_left_capt_mixer_controls[] = {
SOC_DAPM_SINGLE_TLV("L3 Capture Volume",
WM8350_INPUT_MIXER_VOLUME_L, 9, 7, 0, out_mix_tlv),
SOC_DAPM_SINGLE("PGA Capture Switch",
- WM8350_LEFT_INPUT_VOLUME, 14, 1, 0),
+ WM8350_LEFT_INPUT_VOLUME, 14, 1, 1),
};
/* Right Input Mixer */
@@ -589,7 +589,7 @@ static const struct snd_kcontrol_new wm8350_right_capt_mixer_controls[] = {
SOC_DAPM_SINGLE_TLV("L3 Capture Volume",
WM8350_INPUT_MIXER_VOLUME_R, 13, 7, 0, out_mix_tlv),
SOC_DAPM_SINGLE("PGA Capture Switch",
- WM8350_RIGHT_INPUT_VOLUME, 14, 1, 0),
+ WM8350_RIGHT_INPUT_VOLUME, 14, 1, 1),
};
/* Left Mic Mixer */