---

yaml --- r: 223103 b: refs/heads/master c: 0bbaee3 h: refs/heads/master i: 223101: a655384 223099: 820cd36 223095: 3e9cff0 223087: 381ba68 223071: 938ce5d 223039: 37c8645 222975: 0f17f93 v: v3
git-mirror · Dec 8, 2010 · eb98a01 · eb98a01
1 parent 324c267
commit eb98a01
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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];