aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2015-01-07 07:43:50 -0500
committerPhilipp Zabel <p.zabel@pengutronix.de>2015-01-07 12:32:33 -0500
commit639a202cc66716195b73aef1b749a4b50b6abca1 (patch)
tree7743395996a23a26f8751bc6b3709dcc15b24525
parent12b9f204e804b2a6c65a6662b1fbe2449bca677f (diff)
drm: bridge/dw_hdmi: request interrupt only after initializing the mutes
Otherwise a spurious interrupt might trigger (and crash) the interrupt handler before probing finished. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
-rw-r--r--drivers/gpu/drm/bridge/dw_hdmi.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c
index 80bb512a869f..4cc456945c8b 100644
--- a/drivers/gpu/drm/bridge/dw_hdmi.c
+++ b/drivers/gpu/drm/bridge/dw_hdmi.c
@@ -1605,12 +1605,6 @@ int dw_hdmi_bind(struct device *dev, struct device *master,
1605 dev_dbg(hdmi->dev, "no ddc property found\n"); 1605 dev_dbg(hdmi->dev, "no ddc property found\n");
1606 } 1606 }
1607 1607
1608 ret = devm_request_threaded_irq(dev, irq, dw_hdmi_hardirq,
1609 dw_hdmi_irq, IRQF_SHARED,
1610 dev_name(dev), hdmi);
1611 if (ret)
1612 return ret;
1613
1614 hdmi->regs = devm_ioremap_resource(dev, iores); 1608 hdmi->regs = devm_ioremap_resource(dev, iores);
1615 if (IS_ERR(hdmi->regs)) 1609 if (IS_ERR(hdmi->regs))
1616 return PTR_ERR(hdmi->regs); 1610 return PTR_ERR(hdmi->regs);
@@ -1651,6 +1645,12 @@ int dw_hdmi_bind(struct device *dev, struct device *master,
1651 1645
1652 initialize_hdmi_ih_mutes(hdmi); 1646 initialize_hdmi_ih_mutes(hdmi);
1653 1647
1648 ret = devm_request_threaded_irq(dev, irq, dw_hdmi_hardirq,
1649 dw_hdmi_irq, IRQF_SHARED,
1650 dev_name(dev), hdmi);
1651 if (ret)
1652 return ret;
1653
1654 /* 1654 /*
1655 * To prevent overflows in HDMI_IH_FC_STAT2, set the clk regenerator 1655 * To prevent overflows in HDMI_IH_FC_STAT2, set the clk regenerator
1656 * N and cts values before enabling phy 1656 * N and cts values before enabling phy