Merge "ASoC: msm-hdmi-codec-rx: update check for HDMI core state" (f032be61) · Commits · e / devices / android_kernel_sony_msm8994

sound/soc/codecs/msm_hdmi_codec_rx.c

+17 −3

Original line number	Diff line number	Diff line
		@@ -86,6 +86,7 @@ static int msm_hdmi_audio_codec_rx_dai_startup(
		struct snd_pcm_substream *substream,
		struct snd_soc_dai *dai)
		{
		int ret = 0;
		struct msm_hdmi_audio_codec_rx_data *codec_data =
		dev_get_drvdata(dai->codec->dev);

		@@ -94,10 +95,17 @@ static int msm_hdmi_audio_codec_rx_dai_startup(
		codec_data->hdmi_core_pdev, 1);
		if (IS_ERR_VALUE(msm_hdmi_audio_codec_return_value)) {
		dev_err(dai->dev,
		"%s() HDMI core is not ready\n", __func__);
		"%s() HDMI core is not ready (ret val = %d)\n",
		__func__, msm_hdmi_audio_codec_return_value);
		ret = msm_hdmi_audio_codec_return_value;
		} else if (!msm_hdmi_audio_codec_return_value) {
		dev_err(dai->dev,
		"%s() HDMI cable is not connected (ret val = %d)\n",
		__func__, msm_hdmi_audio_codec_return_value);
		ret = -EAGAIN;
		}

		return msm_hdmi_audio_codec_return_value;
		return ret;
		}

		static int msm_hdmi_audio_codec_rx_dai_hw_params(
		@@ -116,8 +124,14 @@ static int msm_hdmi_audio_codec_rx_dai_hw_params(

		if (IS_ERR_VALUE(msm_hdmi_audio_codec_return_value)) {
		dev_err(dai->dev,
		"%s() HDMI core is not ready\n", __func__);
		"%s() HDMI core is not ready (ret val = %d)\n",
		__func__, msm_hdmi_audio_codec_return_value);
		return msm_hdmi_audio_codec_return_value;
		} else if (!msm_hdmi_audio_codec_return_value) {
		dev_err(dai->dev,
		"%s() HDMI cable is not connected (ret val = %d)\n",
		__func__, msm_hdmi_audio_codec_return_value);
		return -EAGAIN;
		}

		/refer to HDMI spec CEA-861-E: Table 28 Audio InfoFrame Data Byte 4/