diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-23 11:28:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-23 11:28:05 -0800 |
| commit | 0200971d2f6a5443869fae7ef8a5f4c8606e5446 (patch) | |
| tree | 1c435ff313d6021e559f172afd4c17400f5b6682 /sound/soc/codecs/wm8962.c | |
| parent | 45196cee28a5bcfb6ddbe2bffa4270cbed66ae4b (diff) | |
| parent | cb74eb15ac88d6aacf7e58db1d8f8dadee710fd9 (diff) | |
Merge tag 'sound-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
sound fixes for 3.3-rc5
Just a collection of boring small fixes for ASoC, HD-audio Realtek
and USB-audio drivers.
* tag 'sound-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: snd-usb-caiaq: Fix the return of XRUN
ASoC: ak4642: fixup HeadPhone L/R dapm settings
ALSA: hda/realtek - Fix surround output regression on Acer Aspire 5935
ALSA: hda/realtek - Fix overflow of vol/sw check bitmap
ALSA: usb-audio: avoid integer overflow in create_fixed_stream_quirk()
ASoC: wm8962: Fix sidetone enumeration texts
Diffstat (limited to 'sound/soc/codecs/wm8962.c')
| -rw-r--r-- | sound/soc/codecs/wm8962.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 29c4b02c479..0ac228b7dc0 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -2564,7 +2564,7 @@ static int dsp2_event(struct snd_soc_dapm_widget *w, return 0; } -static const char *st_text[] = { "None", "Right", "Left" }; +static const char *st_text[] = { "None", "Left", "Right" }; static const struct soc_enum str_enum = SOC_ENUM_SINGLE(WM8962_DAC_DSP_MIXING_1, 2, 3, st_text); |