summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorSubhransu S. Prusty <subhransu.s.prusty@intel.com>2016-03-10 06:34:07 +0300
committerMark Brown <broonie@kernel.org>2016-03-10 06:37:14 +0300
commit391005e8e3cd5bb641dff5abb1ad37254602cd7e (patch)
treeb8871a4fcb2c73d02d7ed78f5566a39c7af611e1 /sound/soc
parent571d507809812e1d9c06aa80be714bf39ece6b8e (diff)
downloadlinux-391005e8e3cd5bb641dff5abb1ad37254602cd7e.tar.xz
ASoC: hdac_hdmi: Fix infoframe programming
Audio infoframe used incorrect buffer, so fix it. Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/hdac_hdmi.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c
index 7851dd204a49..4f7bd1fae0db 100644
--- a/sound/soc/codecs/hdac_hdmi.c
+++ b/sound/soc/codecs/hdac_hdmi.c
@@ -303,7 +303,6 @@ static int hdac_hdmi_setup_audio_infoframe(struct hdac_ext_device *hdac,
if (ret < 0)
return ret;
- dip = (u8 *)&frame;
break;
case DRM_ELD_CONN_TYPE_DP:
@@ -332,9 +331,9 @@ static int hdac_hdmi_setup_audio_infoframe(struct hdac_ext_device *hdac,
/* Fill infoframe. Index auto-incremented */
hdac_hdmi_set_dip_index(hdac, pin_nid, 0x0, 0x0);
if (conn_type == DRM_ELD_CONN_TYPE_HDMI) {
- for (i = 0; i < sizeof(frame); i++)
+ for (i = 0; i < sizeof(buffer); i++)
snd_hdac_codec_write(&hdac->hdac, pin_nid, 0,
- AC_VERB_SET_HDMI_DIP_DATA, dip[i]);
+ AC_VERB_SET_HDMI_DIP_DATA, buffer[i]);
} else {
for (i = 0; i < sizeof(dp_ai); i++)
snd_hdac_codec_write(&hdac->hdac, pin_nid, 0,