summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-01-04 15:00:02 +0100
committerTakashi Iwai <tiwai@suse.de>2013-01-12 08:43:35 +0100
commit05453b7e97996a37db4dd7b97a788124b117dbde (patch)
tree57b43c01682ba43949385462a4f687d66a090c08 /sound/pci
parentALSA: hda - Simplify the multi-io assignment with multi speakers (diff)
downloadlinux-05453b7e97996a37db4dd7b97a788124b117dbde.tar.xz
linux-05453b7e97996a37db4dd7b97a788124b117dbde.zip
ALSA: hda - Fix multi-io pin assignment in create_multi_out_ctls()
The multi-io pins are calculated with a blind assumption of cfg->line_outs = 1. This isn't always true. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/hda_generic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index f9d3ea3c5a68..93db02121efb 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -1368,7 +1368,7 @@ static int create_multi_out_ctls(struct hda_codec *codec,
if (!dac)
continue;
if (i >= cfg->line_outs) {
- pin = spec->multi_io[i - 1].pin;
+ pin = spec->multi_io[i - cfg->line_outs].pin;
index = 0;
name = channel_name[i];
} else {