shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 20:32:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

hdmi: fix set hdmi switch state error when remove hdmi.

Browse Source 
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
This commit is contained in:
Zheng Yang
2015-02-14 08:51:54 +08:00
parent a20f2b7e59
commit f4fed0d820
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/video/rockchip/hdmi/rockchip-hdmi-core.c
View File

@@ -236,7 +236,12 @@ static void hdmi_wq_remove(struct hdmi *hdmi)
DBG("%s", __func__);
if (hdmi->ops->remove)
hdmi->ops->remove(hdmi);
#ifdef CONFIG_SWITCH
if ((hdmi->edid.baseaudio_support &&
hdmi->edid.sink_hdmi) ||
rk_fb_get_display_policy() == DISPLAY_POLICY_BOX)
switch_set_state(&(hdmi->switchdev), 0);
#endif
list_for_each_safe(pos, n, &hdmi->edid.modelist) {
list_del(pos);
kfree(pos);
@@ -259,12 +264,6 @@ static void hdmi_wq_remove(struct hdmi *hdmi)
}
hdmi->hotplug = HDMI_HPD_REMOVED;
hdmi_send_uevent(hdmi, KOBJ_REMOVE);
#ifdef CONFIG_SWITCH
if ((hdmi->edid.baseaudio_support &&
hdmi->edid.sink_hdmi) ||
rk_fb_get_display_policy() == DISPLAY_POLICY_BOX)
switch_set_state(&(hdmi->switchdev), 0);
#endif
}
static void hdmi_work_queue(struct work_struct *work)