aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-01-14 12:39:02 +0100
committerTakashi Iwai <tiwai@suse.de>2010-01-14 12:39:02 +0100
commitc7a8eb103248a110cdbe0530d8c5ce987f099eee (patch)
treeab65c845ef4d034a4198dfd418cbb8c4987f9f5c /sound/pci
parenta76221d47ef2b73ff16c0fef00a784026308ea02 (diff)
downloadkernel_samsung_espresso10-c7a8eb103248a110cdbe0530d8c5ce987f099eee.zip
kernel_samsung_espresso10-c7a8eb103248a110cdbe0530d8c5ce987f099eee.tar.gz
kernel_samsung_espresso10-c7a8eb103248a110cdbe0530d8c5ce987f099eee.tar.bz2
ALSA: hda - Fix missing capture mixer for ALC861/660 codecs
The capture-related mixer elements are missing with ALC861/ALC660 codecs when quirks are present, due to missing call of set_capture_mixer(). Reference: Novell bnc#567340 http://bugzilla.novell.com/show_bug.cgi?id=567340 Signed-off-by: Takashi Iwai <tiwai@suse.de> Cc: <stable@kernel.org>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_realtek.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 11b989b..abae100 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -14879,6 +14879,8 @@ static int patch_alc861(struct hda_codec *codec)
spec->stream_digital_playback = &alc861_pcm_digital_playback;
spec->stream_digital_capture = &alc861_pcm_digital_capture;
+ if (!spec->cap_mixer)
+ set_capture_mixer(codec);
set_beep_amp(spec, 0x23, 0, HDA_OUTPUT);
spec->vmaster_nid = 0x03;