From aa2fabbc2e1110137c8ed7980ccd4e3254aa7c0b Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 21 Feb 2012 12:35:27 +0100 Subject: [PATCH] --- yaml --- r: 293101 b: refs/heads/master c: 689cabf6d07c82003310c221f719130f3a4f29c7 h: refs/heads/master i: 293099: 2af01a0aeb8a1b33c5082aa04559a36944a947c9 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_realtek.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 97590d6c042d..b8e874545c4a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c96f0bf4adc0663a69cdb0e2b73d33e6be312d1c +refs/heads/master: 689cabf6d07c82003310c221f719130f3a4f29c7 diff --git a/trunk/sound/pci/hda/patch_realtek.c b/trunk/sound/pci/hda/patch_realtek.c index 3cedb26f9cf5..e5c04593d360 100644 --- a/trunk/sound/pci/hda/patch_realtek.c +++ b/trunk/sound/pci/hda/patch_realtek.c @@ -3613,14 +3613,17 @@ static int alc_auto_create_multi_out_ctls(struct hda_codec *codec, dac = spec->multiout.dac_nids[i]; if (!dac) continue; - if (i >= cfg->line_outs) + if (i >= cfg->line_outs) { pin = spec->multi_io[i - 1].pin; - else + index = 0; + name = channel_name[i]; + } else { pin = cfg->line_out_pins[i]; + name = alc_get_line_out_pfx(spec, i, true, &index); + } sw = alc_look_for_out_mute_nid(codec, pin, dac); vol = alc_look_for_out_vol_nid(codec, pin, dac); - name = alc_get_line_out_pfx(spec, i, true, &index); if (!name || !strcmp(name, "CLFE")) { /* Center/LFE */ err = alc_auto_add_vol_ctl(codec, "Center", 0, vol, 1);