diff --git a/sound/soc/codecs/msm_hdmi_codec_rx.c b/sound/soc/codecs/msm_hdmi_codec_rx.c
index 002476d7a923..241410c60b97 100755
--- a/sound/soc/codecs/msm_hdmi_codec_rx.c
+++ b/sound/soc/codecs/msm_hdmi_codec_rx.c
@@ -38,8 +38,12 @@ static int msm_hdmi_edid_ctl_info(struct snd_kcontrol *kcontrol,
 
 	codec_data = snd_soc_codec_get_drvdata(codec);
 
-	if (!codec_data->hdmi_ops.get_audio_edid_blk)
-		return -EINVAL;
+	if (!codec_data->hdmi_ops.get_audio_edid_blk) {
+		pr_debug("%s: get_audio_edid_blk() is NULL\n", __func__);
+		uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES;
+		uinfo->count = 0;
+		return 0;
+	}
 
 	rc = codec_data->hdmi_ops.get_audio_edid_blk(
 			codec_data->hdmi_core_pdev,