aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Chen <jason.chen@linaro.org>2011-12-27 16:12:07 +0800
committerEric Miao <eric.miao@linaro.org>2012-01-11 21:39:38 +0800
commit484b9c5a319170a45802d24ad0e70aa59dd4ad78 (patch)
tree4b7f74c5a255fee0e86830aa4ef62041689e7931
parent379543c8773b5b45b061e97b7a99cd5453942568 (diff)
downloadlinux-linaro-484b9c5a319170a45802d24ad0e70aa59dd4ad78.tar.gz
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 97547a90adc..b212ad128b7 100644
--- a/drivers/video/mxc_hdmi.c
+++ b/drivers/video/mxc_hdmi.c
@@ -1969,12 +1969,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);
@@ -1993,9 +1993,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,