diff options
| author | Takashi Iwai <tiwai@suse.de> | 2007-04-20 16:11:43 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2007-05-11 16:56:08 +0200 |
| commit | 9422db4018cbfaa1a330b018a2bf6527d282b417 (patch) | |
| tree | ff46b591ccbd68cb4e8c711042c0ba3215cc2f02 /sound | |
| parent | 2078f38c8008f5c54d9523ae19af32b9a0c5530e (diff) | |
| download | linux-9422db4018cbfaa1a330b018a2bf6527d282b417.tar.gz linux-9422db4018cbfaa1a330b018a2bf6527d282b417.tar.bz2 linux-9422db4018cbfaa1a330b018a2bf6527d282b417.zip | |
[ALSA] hda-codec - Fix 8-channel auto-configuration
Fix the auto-configuration of 8-channel devices. The sequence numbers
of usual 7.1 outputs are: 0/1/2/4 = Front/CLFE/Rear/Side
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 2fdd1652bad3..a58fdf4cbe5c 100644 --- a/sound/pci/hda/hda_codec.c +++ b/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; } |