Commit f5b2d0ef authored Jun 29, 2011 by Wu Fengguang Committed by Takashi Iwai Jun 29, 2011

ALSA: HDMI - fix ELD monitor name length



I noticed that the last character of the ELD monitor name is lost,
this fixes the issue.

This fix should be confirming to the HDA spec, and works together with
the DRM part of the ELD patch.

The HDA spec does not mention that Monitor_Name_String is an '\0'
ending string, and it allows NML to be 1, which is only valid when MNL
does not count the possible ending '\0'.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent 0cfae7c9

sound/pci/hda/hda_eld.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -294,7 +294,7 @@ static int hdmi_update_eld(struct hdmi_eld *e,
		snd_printd(KERN_INFO "HDMI: out of range MNL %d\n", mnl);
		goto out_fail;
		} else
		strlcpy(e->monitor_name, buf + ELD_FIXED_BYTES, mnl);
		strlcpy(e->monitor_name, buf + ELD_FIXED_BYTES, mnl + 1);

		for (i = 0; i < e->sad_count; i++) {
		if (ELD_FIXED_BYTES + mnl + 3 * (i + 1) > size) {

Admin message