summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Chen <jason.chen@linaro.org>2011-12-27 16:12:07 +0800
committerJustin Waters <justin.waters@timesys.com>2012-07-03 16:57:52 -0400
commita5382bbbce3aa2e7587f98d7a751a2d85fca02cc (patch)
tree3fd98d9150dd4e67a7e502c5302bae49aced68f2
parent6402bebe15ea619a13e79f6d0cbcc94f1d352587 (diff)
mxc: hdmi: fix potention deadlock issue
Signed-off-by: Jason Chen <jason.chen@linaro.org>
-rw-r--r--drivers/video/mxc_hdmi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/mxc_hdmi.c b/drivers/video/mxc_hdmi.c
index 3c1f8fd2eb81..9e83df0066fb 100644
--- a/drivers/video/mxc_hdmi.c
+++ b/drivers/video/mxc_hdmi.c
@@ -2033,12 +2033,12 @@ static void mxc_hdmi_fb_registered(struct mxc_hdmi *hdmi)
if (hdmi->fb_reg)
return;
+ clk_enable(hdmi->hdmi_iahb_clk);
+
spin_lock_irqsave(&hdmi->irq_lock, flags);
dev_dbg(&hdmi->pdev->dev, "%s\n", __func__);
- clk_enable(hdmi->hdmi_iahb_clk);
-
hdmi_writeb(HDMI_PHY_I2CM_INT_ADDR_DONE_POL,
HDMI_PHY_I2CM_INT_ADDR);
@@ -2057,9 +2057,9 @@ static void mxc_hdmi_fb_registered(struct mxc_hdmi *hdmi)
hdmi->fb_reg = true;
- clk_disable(hdmi->hdmi_iahb_clk);
-
spin_unlock_irqrestore(&hdmi->irq_lock, flags);
+
+ clk_disable(hdmi->hdmi_iahb_clk);
}
static int mxc_hdmi_fb_event(struct notifier_block *nb,