From 7319f37b712c5cdf4b4082b86fc601ad76998389 Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Wed, 16 Feb 2011 21:34:04 +0100
Subject: [PATCH] --- yaml --- r: 233472 b: refs/heads/master c:
 89724958e5d596bb91328644c97dd80399443e87 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/sound/pci/hda/patch_conexant.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8b6dbd36d471..1f7c0ade2548 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 983345e51e0de144775c7449e5cb01ce6cdd1346
+refs/heads/master: 89724958e5d596bb91328644c97dd80399443e87
diff --git a/trunk/sound/pci/hda/patch_conexant.c b/trunk/sound/pci/hda/patch_conexant.c
index cd29eafdc0ed..dd7c5c12225d 100644
--- a/trunk/sound/pci/hda/patch_conexant.c
+++ b/trunk/sound/pci/hda/patch_conexant.c
@@ -3410,7 +3410,7 @@ static void cx_auto_parse_output(struct hda_codec *codec)
 		}
 	}
 	spec->multiout.dac_nids = spec->private_dac_nids;
-	spec->multiout.max_channels = nums * 2;
+	spec->multiout.max_channels = spec->multiout.num_dacs * 2;
 
 	if (cfg->hp_outs > 0)
 		spec->auto_mute = 1;