diff options
| author | Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | 2022-11-02 17:37:08 +0300 |
|---|---|---|
| committer | Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | 2022-11-02 17:37:08 +0300 |
| commit | 9a5c1586e8098a19cbf3e7f5d6fa1d1d3c1efa13 (patch) | |
| tree | ee36d7c718535ca99eea9a4185d95242897d9c7a /drivers/gpu/drm/msm/hdmi/hdmi.c | |
| parent | 7f7a942c0a338c4a2a7b359bdb2b68e9896122ec (diff) | |
| parent | e0e86f25fd469ca76c1b50091372aed1ff99ca1a (diff) | |
Merge remote-tracking branch 'msm/msm-fixes' into HEAD
Diffstat (limited to 'drivers/gpu/drm/msm/hdmi/hdmi.c')
| -rw-r--r-- | drivers/gpu/drm/msm/hdmi/hdmi.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c index 93fe61b86967..f28fb21e3891 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -300,6 +300,11 @@ int msm_hdmi_modeset_init(struct hdmi *hdmi, struct platform_device *pdev = hdmi->pdev; int ret; + if (priv->num_bridges == ARRAY_SIZE(priv->bridges)) { + DRM_DEV_ERROR(dev->dev, "too many bridges\n"); + return -ENOSPC; + } + hdmi->dev = dev; hdmi->encoder = encoder; @@ -339,7 +344,7 @@ int msm_hdmi_modeset_init(struct hdmi *hdmi, goto fail; } - ret = devm_request_irq(&pdev->dev, hdmi->irq, + ret = devm_request_irq(dev->dev, hdmi->irq, msm_hdmi_irq, IRQF_TRIGGER_HIGH, "hdmi_isr", hdmi); if (ret < 0) { |