From: Zheng Yang <zhengyang@rock-chips.com>
Date: Sat, 23 May 2015 03:08:49 +0000 (+0800)
Subject: HDMI: No need to set audio when hdmi is not connected.
X-Git-Tag: firefly_0821_release~4123
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1f03967adf26158be210eade2fb13b24af1181c8;p=firefly-linux-kernel-4.4.55.git

HDMI: No need to set audio when hdmi is not connected.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
---

diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmi-core.c b/drivers/video/rockchip/hdmi/rockchip-hdmi-core.c
index 4b6cef9480bb..3d1abfe424e4 100644
--- a/drivers/video/rockchip/hdmi/rockchip-hdmi-core.c
+++ b/drivers/video/rockchip/hdmi/rockchip-hdmi-core.c
@@ -579,7 +579,8 @@ int hdmi_config_audio(struct hdmi_audio	*audio)
 			continue;
 		}*/
 		memcpy(&hdmi->audio, audio, sizeof(struct hdmi_audio));
-		hdmi_submit_work(hdmi, HDMI_SET_AUDIO, 0, NULL);
+		if (hdmi->hotplug == HDMI_HPD_ACTIVED)
+			hdmi_submit_work(hdmi, HDMI_SET_AUDIO, 0, NULL);
 	}
 	return 0;
 }