Skip to content

Commit

Permalink
drm: bridge/dw_hdmi: request interrupt only after initializing the mutes
Browse files Browse the repository at this point in the history
Otherwise a spurious interrupt might trigger (and crash) the interrupt handler
before probing finished.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
  • Loading branch information
Philipp Zabel committed Jan 7, 2015
1 parent 12b9f20 commit 639a202
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/gpu/drm/bridge/dw_hdmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1605,12 +1605,6 @@ int dw_hdmi_bind(struct device *dev, struct device *master,
dev_dbg(hdmi->dev, "no ddc property found\n");
}

ret = devm_request_threaded_irq(dev, irq, dw_hdmi_hardirq,
dw_hdmi_irq, IRQF_SHARED,
dev_name(dev), hdmi);
if (ret)
return ret;

hdmi->regs = devm_ioremap_resource(dev, iores);
if (IS_ERR(hdmi->regs))
return PTR_ERR(hdmi->regs);
Expand Down Expand Up @@ -1651,6 +1645,12 @@ int dw_hdmi_bind(struct device *dev, struct device *master,

initialize_hdmi_ih_mutes(hdmi);

ret = devm_request_threaded_irq(dev, irq, dw_hdmi_hardirq,
dw_hdmi_irq, IRQF_SHARED,
dev_name(dev), hdmi);
if (ret)
return ret;

/*
* To prevent overflows in HDMI_IH_FC_STAT2, set the clk regenerator
* N and cts values before enabling phy
Expand Down

0 comments on commit 639a202

Please sign in to comment.