aboutsummaryrefslogtreecommitdiffstats
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:18:08 -0700
commit2e4010695a44d36c2f5cd5bbe0724d32f31c1590 (patch)
treec409ef9405377cff7ed4b4a84112d1a0d4454877 /sound
parent06cc39593b0a9fed3f8ecbed6d30d8c3368ccbe0 (diff)
downloadkernel_samsung_smdk4412-2e4010695a44d36c2f5cd5bbe0724d32f31c1590.zip
kernel_samsung_smdk4412-2e4010695a44d36c2f5cd5bbe0724d32f31c1590.tar.gz
kernel_samsung_smdk4412-2e4010695a44d36c2f5cd5bbe0724d32f31c1590.tar.bz2
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 e3e8531..64365a5 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;