summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-09-20 15:09:03 +0200
committerTakashi Iwai <tiwai@suse.de>2010-09-20 15:36:03 +0200
commitf3550d1b052a8acf4159b407dbdd1def47f223f9 (patch)
tree7bbb4cb66ecb71ba667b81d8cb38c46ff56e60ae
parentALSA: hda - Optimize the check of ALC269 codec variants (diff)
downloadlinux-f3550d1b052a8acf4159b407dbdd1def47f223f9.tar.xz
linux-f3550d1b052a8acf4159b407dbdd1def47f223f9.zip
ALSA: hda - Fix capture widget for ALC269vb and co
ALC269vb and other variants don't use the widgets 0x24 but prefer the widget 0x22 instead. We need to fix the input parser. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/patch_realtek.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 9bcf34eab679..4abe3da1240c 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -14593,7 +14593,11 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
err = alc269_auto_create_multi_out_ctls(spec, &spec->autocfg);
if (err < 0)
return err;
- err = alc269_auto_create_input_ctls(codec, &spec->autocfg);
+ if (spec->codec_variant == ALC269_TYPE_NORMAL)
+ err = alc269_auto_create_input_ctls(codec, &spec->autocfg);
+ else
+ err = alc_auto_create_input_ctls(codec, &spec->autocfg, 0,
+ 0x22, 0);
if (err < 0)
return err;