summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-01 23:46:58 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-13 11:16:59 -0800
commit520a5189a6745dcd3b61e87562e28d6e8aba12f8 (patch)
tree46e4439a7581916e5987b9d851335bba7f060c2e
parentf11e42f5205653968c6496e637b1cd524405a9ec (diff)
downloadkernel-common-520a5189a6745dcd3b61e87562e28d6e8aba12f8.tar.gz
kernel-common-520a5189a6745dcd3b61e87562e28d6e8aba12f8.tar.bz2
kernel-common-520a5189a6745dcd3b61e87562e28d6e8aba12f8.zip
ASoC: wm_hubs: Correct line input to line output 2 paths
commit 43b6cec27e1e50a1de3eff47e66e502f3fe7e66e upstream. The second line output mixer has the controls for the line input bypasses in the opposite order. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--sound/soc/codecs/wm_hubs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 6ef228341e0a..3642e06e1d09 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -587,8 +587,8 @@ SOC_DAPM_SINGLE("Left Output Switch", WM8993_LINE_MIXER1, 0, 1, 0),
};
static const struct snd_kcontrol_new line2_mix[] = {
-SOC_DAPM_SINGLE("IN1R Switch", WM8993_LINE_MIXER2, 2, 1, 0),
-SOC_DAPM_SINGLE("IN1L Switch", WM8993_LINE_MIXER2, 1, 1, 0),
+SOC_DAPM_SINGLE("IN1L Switch", WM8993_LINE_MIXER2, 2, 1, 0),
+SOC_DAPM_SINGLE("IN1R Switch", WM8993_LINE_MIXER2, 1, 1, 0),
SOC_DAPM_SINGLE("Output Switch", WM8993_LINE_MIXER2, 0, 1, 0),
};