summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMengdong Lin <mengdong.lin@intel.com>2013-03-28 05:20:22 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-12 09:38:44 -0700
commit276674490c2f110d12c7009bb6d74757a678cd0c (patch)
tree2b0ed6663370c7c818a6cffe93beee1f446d9c54 /sound
parentb57644a59a635af74fde8e4548754de338752422 (diff)
downloadlinux-3.10-276674490c2f110d12c7009bb6d74757a678cd0c.tar.gz
linux-3.10-276674490c2f110d12c7009bb6d74757a678cd0c.tar.bz2
linux-3.10-276674490c2f110d12c7009bb6d74757a678cd0c.zip
ALSA: hda - bug fix on return value when getting HDMI ELD info
commit 2ef5692efad330b67a234e2c49edad38538751e7 upstream. In function snd_hdmi_get_eld(), the variable 'ret' should be initialized to 0. Otherwise it will be returned uninitialized as non-zero after ELD info is got successfully. Thus hdmi_present_sense() will always assume ELD info is invalid by mistake, and /proc file system cannot show the proper ELD info. Signed-off-by: Mengdong Lin <mengdong.lin@intel.com> Acked-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_eld.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c
index 4c054f4486b..86f6468cb23 100644
--- a/sound/pci/hda/hda_eld.c
+++ b/sound/pci/hda/hda_eld.c
@@ -322,7 +322,7 @@ int snd_hdmi_get_eld(struct hdmi_eld *eld,
struct hda_codec *codec, hda_nid_t nid)
{
int i;
- int ret;
+ int ret = 0;
int size;
unsigned char *buf;