---

yaml --- r: 257775 b: refs/heads/master c: 7b1655f h: refs/heads/master i: 257773: 1b86cf3 257771: 45a538e 257767: 88d6d8e 257759: 26176bb v: v3
git-mirror · Jul 14, 2011 · cf2858a · cf2858a
1 parent af03233
commit cf2858a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf01b73e26a8e93b46cf0b8ae878206277fb8838
+refs/heads/master: 7b1655f5f21a9bd1eb8b478c5dab9b83de809edc
diff --git a/trunk/sound/pci/hda/patch_realtek.c b/trunk/sound/pci/hda/patch_realtek.c
@@ -3196,6 +3196,8 @@ static int alc_auto_ch_mode_put(struct snd_kcontrol *kcontrol,
 	for (i = 0; i < spec->multi_ios; i++)
 		alc_set_multi_io(codec, i, i < ch);
 	spec->multiout.max_channels = spec->ext_channel_count;
+	if (spec->need_dac_fix && !spec->const_channel_count)
+		spec->multiout.num_dacs = spec->multiout.max_channels / 2;
 	return 1;
 }
 
@@ -3642,6 +3644,7 @@ static int patch_alc880(struct hda_codec *codec)
 	codec->spec = spec;
 
 	spec->mixer_nid = 0x0b;
+	spec->need_dac_fix = 1;
 
 	board_config = alc_board_config(codec, ALC880_MODEL_LAST,
 					alc880_models, alc880_cfg_tbl);