aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-01-19 05:42:55 -0500
committerTakashi Iwai <tiwai@suse.de>2012-01-19 05:42:55 -0500
commitb90bf1de7cb65e7f61798fcfbcf74ae72207b0dc (patch)
tree5c368e45a5ab0589cb1f13674b1f50baaee775bc /sound
parentf0e48b6bd4e407459715240cd241ddb6b89bdf81 (diff)
ALSA: hda/realtek - Avoid multi-ios conflicting with multi-speakers
When a machine has multiple speakers, we don't need to create the controls for multi-ios. Check the number of primary outputs beforehand. Note that this workaround might not work always with new codecs in future; this assumes that both speakers and multi-io jacks share the same mixers/DACs. If they are routed with different mixers, the individual mixer controls should be needed. But, so far, this doesn't happen with the existing ALC codecs. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_realtek.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 5e82acf77c5a..61ccbe832b75 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -3233,7 +3233,7 @@ static int alc_auto_create_multi_out_ctls(struct hda_codec *codec,
3233 int i, err, noutputs; 3233 int i, err, noutputs;
3234 3234
3235 noutputs = cfg->line_outs; 3235 noutputs = cfg->line_outs;
3236 if (spec->multi_ios > 0) 3236 if (spec->multi_ios > 0 && cfg->line_outs < 3)
3237 noutputs += spec->multi_ios; 3237 noutputs += spec->multi_ios;
3238 3238
3239 for (i = 0; i < noutputs; i++) { 3239 for (i = 0; i < noutputs; i++) {