From: Xubilv <xbl@rock-chips.com>
Date: Sat, 8 Oct 2016 07:46:46 +0000 (+0800)
Subject: video: rockchip: edp: read/write register before pm_runtime_put
X-Git-Tag: firefly_0821_release~1451
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4190022d1f5bbc7b87d2052952e403c49ed1e3c8;p=firefly-linux-kernel-4.4.55.git

video: rockchip: edp: read/write register before pm_runtime_put

Change-Id: I3a6a910857ff4c6921996f625807b4aefc4cd5a1
Signed-off-by: Xubilv <xbl@rock-chips.com>
---

diff --git a/drivers/video/rockchip/transmitter/rk32_dp.c b/drivers/video/rockchip/transmitter/rk32_dp.c
index e4716934f0c9..ec036006daa1 100755
--- a/drivers/video/rockchip/transmitter/rk32_dp.c
+++ b/drivers/video/rockchip/transmitter/rk32_dp.c
@@ -1231,12 +1231,12 @@ static int  rk32_edp_disable(void)
 	struct rk32_edp *edp = rk32_edp;
 
 	if (edp->edp_en) {
-		pm_runtime_put(edp->dev);
+		edp->edp_en = false;
 		disable_irq(edp->irq);
 		rk32_edp_reset(edp);
 		rk32_edp_analog_power_ctr(edp, 0);
 		rk32_edp_clk_disable(edp);
-		edp->edp_en = false;
+		pm_runtime_put_sync(edp->dev);
 	}
 
 	return 0;