From: Zheng Yang <zhengyang@rock-chips.com>
Date: Thu, 9 Apr 2015 10:01:51 +0000 (+0800)
Subject: HDMI: call function hdmi->ops->disable() if it is disabled.
X-Git-Tag: firefly_0821_release~4158^2~221
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2258ac9cca90ccccb7701db8ba55a2b1a0eb9648;p=firefly-linux-kernel-4.4.55.git

HDMI: call function hdmi->ops->disable() if it is disabled.
      For system can not be wakeup under following case:
      step1. Disable HDMI.
      step2. set system to deep sleep mode.
      step3. remove HDMI connection.
      step4. wake up system.

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 290462d93267..10d03cfc495d 100644
--- a/drivers/video/rockchip/hdmi/rockchip-hdmi-core.c
+++ b/drivers/video/rockchip/hdmi/rockchip-hdmi-core.c
@@ -301,10 +301,8 @@ static void hdmi_work_queue(struct work_struct *work)
 	case HDMI_DISABLE_CTL:
 		if (hdmi->enable) {
 			if (!hdmi->sleep) {
-				/*
 				if (hdmi->ops->disable)
 					hdmi->ops->disable(hdmi);
-				*/
 				hdmi_wq_remove(hdmi);
 			}
 			hdmi->enable = 0;