summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-12-15 13:40:42 +0100
committerTakashi Iwai <tiwai@suse.de>2014-12-15 13:40:42 +0100
commit82d04e1088769c769c87ffa1d4df5e4a228f637a (patch)
tree58bfa39026453fe0f7f2d9c6851a382fdd7d5262 /sound
parentc10b11f6cd1319ba1d8133cf416e61181650f368 (diff)
downloadlinux-82d04e1088769c769c87ffa1d4df5e4a228f637a.tar.bz2
ALSA: hda - Create capture source ctls when stereo mix input is added
When the stereo mix input is explicitly enabled via a user hint, the driver should create always a capture source enum ctl and disable the auto-mic switch. Otherwise the behavior gets confused. For doing it, this patch just sets spec->suppress_auto_mic flag appropriately. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_generic.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 63b69f750d8e..293af6b5ba3d 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -3224,6 +3224,8 @@ static int create_input_ctls(struct hda_codec *codec)
"Stereo Mix", 0);
if (err < 0)
return err;
+ else
+ spec->suppress_auto_mic = 1;
}
return 0;