From cf2858a3c0450910bc9ecc5254bbd6d515b039a2 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 14 Jul 2011 15:31:21 +0200
Subject: [PATCH] --- yaml --- r: 257775 b: refs/heads/master c:
 7b1655f5f21a9bd1eb8b478c5dab9b83de809edc h: refs/heads/master i:   257773:
 1b86cf34603043006368c669d02805347d845c62   257771:
 45a538e1edfc9313f1e5b4b3b4ac59f958205c16   257767:
 88d6d8e08e2f41224772c74e8c56feca4977dcff   257759:
 26176bbc08de6e92a8e1c8327a492896dd854742 v: v3

---
 [refs]                              | 2 +-
 trunk/sound/pci/hda/patch_realtek.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 00052973034e..0ee5a1c662ea 100644
--- 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
index 124c63f4c457..52ce07534e5b 100644
--- 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);