From eb98a01a1322ce3aa4646ffc5f58967b219bb24d Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi.hannula@iki.fi>
Date: Tue, 7 Dec 2010 21:19:23 +0200
Subject: [PATCH] --- yaml --- r: 223103 b: refs/heads/master c:
 0bbaee3a58c379c4f7bab9635c71d7bad9c422a2 h: refs/heads/master i:   223101:
 a655384a88bd75c180ac3ba8c4dc156f0a635478   223099:
 820cd36ed58f5fc4b205a1f04f5305b5bf68b13b   223095:
 3e9cff00757ebb4f6aeafe6c6115e8b0e05158f5   223087:
 381ba6800dc04cfcda08f838504e7a8b9ccddd92   223071:
 938ce5d44ca9124db58b34f1d5ec788e70721163   223039:
 37c86454dd9e4dfc3ebcc375e7dea8b6f822c257   222975:
 0f17f934f19c9a088434722a3791eeb4ce314ca8 v: v3

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

diff --git a/[refs] b/[refs]
index a5d3fb148853..85d5eece86ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dc86429032910bdf762adeb2969112bb303924c
+refs/heads/master: 0bbaee3a58c379c4f7bab9635c71d7bad9c422a2
diff --git a/trunk/sound/pci/hda/hda_eld.c b/trunk/sound/pci/hda/hda_eld.c
index 009031fae2ba..4a663471dadc 100644
--- a/trunk/sound/pci/hda/hda_eld.c
+++ b/trunk/sound/pci/hda/hda_eld.c
@@ -189,6 +189,9 @@ static void hdmi_update_short_audio_desc(struct cea_sad *a,
 	a->channels = GRAB_BITS(buf, 0, 0, 3);
 	a->channels++;
 
+	a->sample_bits = 0;
+	a->max_bitrate = 0;
+
 	a->format = GRAB_BITS(buf, 0, 3, 4);
 	switch (a->format) {
 	case AUDIO_CODING_TYPE_REF_STREAM_HEADER:
@@ -198,7 +201,6 @@ static void hdmi_update_short_audio_desc(struct cea_sad *a,
 
 	case AUDIO_CODING_TYPE_LPCM:
 		val = GRAB_BITS(buf, 2, 0, 3);
-		a->sample_bits = 0;
 		for (i = 0; i < 3; i++)
 			if (val & (1 << i))
 				a->sample_bits |= cea_sample_sizes[i + 1];