From 125d81f7db35e25b23cf49e0490d6fd41a8c925e Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 20 Apr 2007 16:11:43 +0200 Subject: [PATCH] --- yaml --- r: 56181 b: refs/heads/master c: 9422db4018cbfaa1a330b018a2bf6527d282b417 h: refs/heads/master i: 56179: a521189c1e78526564aad4c2089863e75b37f387 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_codec.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 3b89ad8506ff..1b203528f372 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2078f38c8008f5c54d9523ae19af32b9a0c5530e +refs/heads/master: 9422db4018cbfaa1a330b018a2bf6527d282b417 diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c index 2fdd1652bad3..a58fdf4cbe5c 100644 --- a/trunk/sound/pci/hda/hda_codec.c +++ b/trunk/sound/pci/hda/hda_codec.c @@ -2242,18 +2242,13 @@ int __devinit snd_hda_parse_pin_def_config(struct hda_codec *codec, * HDA sequence is: * 4-ch: front/surr => OK as it is * 6-ch: front/clfe/surr - * 8-ch: front/clfe/side/surr + * 8-ch: front/clfe/rear/side|fc */ switch (cfg->line_outs) { case 3: - nid = cfg->line_out_pins[1]; - cfg->line_out_pins[1] = cfg->line_out_pins[2]; - cfg->line_out_pins[2] = nid; - break; case 4: nid = cfg->line_out_pins[1]; - cfg->line_out_pins[1] = cfg->line_out_pins[3]; - cfg->line_out_pins[3] = cfg->line_out_pins[2]; + cfg->line_out_pins[1] = cfg->line_out_pins[2]; cfg->line_out_pins[2] = nid; break; }