aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Tull <alan.tull@freescale.com>2011-10-26 10:40:17 -0500
committerEric Miao <eric.miao@canonical.com>2011-11-10 07:38:53 +0800
commit50f7afb0de8c53a0b990b66b92e7b6cd3ada784f (patch)
treebaa872bbcdceb3b1daa19fa7a2b4c9eaf3113cf7
parent759333c472851331d0d2690dde654265584b681d (diff)
ENGR00160855 balance spinlock and irq enable in mxc hdmi video isr
Need to add a spinlock unlock and irq enable at a return path. Signed-off-by: Alan Tull <alan.tull@freescale.com>
-rw-r--r--drivers/video/mxc_hdmi.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/mxc_hdmi.c b/drivers/video/mxc_hdmi.c
index c3c0164b224..d48170dab4e 100644
--- a/drivers/video/mxc_hdmi.c
+++ b/drivers/video/mxc_hdmi.c
@@ -1461,9 +1461,11 @@ static irqreturn_t mxc_hdmi_hotplug(int irq, void *data)
if (ret == IRQ_DISABLE_FAIL) {
/* Capture status - used in det_worker ISR */
intr_stat = hdmi_readb(HDMI_IH_PHY_STAT0);
- if ((intr_stat & HDMI_IH_PHY_STAT0_HPD) == 0)
+ if ((intr_stat & HDMI_IH_PHY_STAT0_HPD) == 0) {
+ hdmi_irq_enable(irq);
+ spin_unlock_irqrestore(&hdmi->irq_lock, flags);
return IRQ_HANDLED;
-
+ }
dev_dbg(&hdmi->pdev->dev, "Hotplug interrupt received\n");
hdmi->latest_intr_stat = intr_stat;