diff options
| author | Dave Airlie | 2019-02-18 04:27:15 +0100 |
|---|---|---|
| committer | Dave Airlie | 2019-02-18 04:27:15 +0100 |
| commit | c06de56121e3ac0f0f1f4a081c041654ffcacd62 (patch) | |
| tree | 3662e7052352b0f1b78e8832b1d3b91ca211b798 /drivers/gpu/drm/msm/msm_gpu.c | |
| parent | Merge tag 'drm-misc-next-2019-02-11' of git://anongit.freedesktop.org/drm/drm... (diff) | |
| parent | Linux 5.0-rc7 (diff) | |
| download | kernel-qcow2-linux-c06de56121e3ac0f0f1f4a081c041654ffcacd62.tar.gz kernel-qcow2-linux-c06de56121e3ac0f0f1f4a081c041654ffcacd62.tar.xz kernel-qcow2-linux-c06de56121e3ac0f0f1f4a081c041654ffcacd62.zip | |
Merge v5.0-rc7 into drm-next
Backmerging for nouveau and imx that needed some fixes for next pulls.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gpu.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 5f3eff304355..10babd18e286 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -900,7 +900,7 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, } /* Get Interrupt: */ - gpu->irq = platform_get_irq_byname(pdev, config->irqname); + gpu->irq = platform_get_irq(pdev, 0); if (gpu->irq < 0) { ret = gpu->irq; DRM_DEV_ERROR(drm->dev, "failed to get irq: %d\n", ret); |