From 484b9c5a319170a45802d24ad0e70aa59dd4ad78 Mon Sep 17 00:00:00 2001 From: Jason Chen Date: Tue, 27 Dec 2011 16:12:07 +0800 Subject: mxc: hdmi: fix potention deadlock issue Signed-off-by: Jason Chen --- drivers/video/mxc_hdmi.c | 8 ++++---- 1 file 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, -- cgit v1.2.3