projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 60859109 GKH |
1 | From 689185b78ba6fbe0042f662a468b5565909dff7a Mon Sep 17 00:00:00 2001 |
| 2 | From: Mark Brown <broonie@opensource.wolfsonmicro.com> | |
| 3 | Date: Tue, 31 Jul 2012 18:37:29 +0100 | |
| 4 | Subject: ASoC: wm9712: Fix name of Capture Switch | |
| 5 | ||
| 6 | From: Mark Brown <broonie@opensource.wolfsonmicro.com> | |
| 7 | ||
| 8 | commit 689185b78ba6fbe0042f662a468b5565909dff7a upstream. | |
| 9 | ||
| 10 | Help UIs associate it with the matching gain control. | |
| 11 | ||
| 12 | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> | |
| 13 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 14 | ||
| 15 | --- | |
| 16 | sound/soc/codecs/wm9712.c | 2 +- | |
| 17 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 18 | ||
| 19 | --- a/sound/soc/codecs/wm9712.c | |
| 20 | +++ b/sound/soc/codecs/wm9712.c | |
| 21 | @@ -146,7 +146,7 @@ SOC_SINGLE("Playback Attenuate (-6dB) Sw | |
| 22 | SOC_SINGLE("Bass Volume", AC97_MASTER_TONE, 8, 15, 1), | |
| 23 | SOC_SINGLE("Treble Volume", AC97_MASTER_TONE, 0, 15, 1), | |
| 24 | ||
| 25 | -SOC_SINGLE("Capture ADC Switch", AC97_REC_GAIN, 15, 1, 1), | |
| 26 | +SOC_SINGLE("Capture Switch", AC97_REC_GAIN, 15, 1, 1), | |
| 27 | SOC_ENUM("Capture Volume Steps", wm9712_enum[6]), | |
| 28 | SOC_DOUBLE("Capture Volume", AC97_REC_GAIN, 8, 0, 63, 0), | |
| 29 | SOC_SINGLE("Capture ZC Switch", AC97_REC_GAIN, 7, 1, 0), |