diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-01 23:46:58 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-13 11:06:10 -0800 |
| commit | b855f76b5f217bd6d03c7dfa38a64b51143338ac (patch) | |
| tree | 90357bf89d4adfd0b99114301d937cf24661abd1 /sound/soc | |
| parent | 30b4b3a54fc6ca34c6f8a18b56c83680ad0a7fa9 (diff) | |
| download | kernel_samsung_aries-b855f76b5f217bd6d03c7dfa38a64b51143338ac.zip kernel_samsung_aries-b855f76b5f217bd6d03c7dfa38a64b51143338ac.tar.gz kernel_samsung_aries-b855f76b5f217bd6d03c7dfa38a64b51143338ac.tar.bz2 | |
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>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm_hubs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c index f2e07b5..8712a9f 100644 --- a/sound/soc/codecs/wm_hubs.c +++ b/sound/soc/codecs/wm_hubs.c @@ -562,8 +562,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), }; |