diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-05-04 00:56:27 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-05-04 00:56:27 +0200 |
| commit | df9ebeb2da3ae0122f44521ee833d31e1a2b3845 (patch) | |
| tree | ca7e4f26b87d4be57119bd25746ce1bb4b47388b /drivers/gpu | |
| parent | Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux int... (diff) | |
| parent | drm/rockchip: fix error check when getting irq (diff) | |
| download | linux-df9ebeb2da3ae0122f44521ee833d31e1a2b3845.tar.xz linux-df9ebeb2da3ae0122f44521ee833d31e1a2b3845.zip | |
Merge branch 'drm-next0420' of https://github.com/markyzq/kernel-drm-rockchip into drm-fixes
one fix and maintainers update
* 'drm-next0420' of https://github.com/markyzq/kernel-drm-rockchip:
drm/rockchip: fix error check when getting irq
MAINTAINERS: add entry for Rockchip drm drivers
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index ccb0ce073ef2..4557f335a8a5 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -1409,7 +1409,7 @@ static int vop_bind(struct device *dev, struct device *master, void *data) struct vop *vop; struct resource *res; size_t alloc_size; - int ret; + int ret, irq; of_id = of_match_device(vop_driver_dt_match, dev); vop_data = of_id->data; @@ -1445,11 +1445,12 @@ static int vop_bind(struct device *dev, struct device *master, void *data) return ret; } - vop->irq = platform_get_irq(pdev, 0); - if (vop->irq < 0) { + irq = platform_get_irq(pdev, 0); + if (irq < 0) { dev_err(dev, "cannot find irq for vop\n"); - return vop->irq; + return irq; } + vop->irq = (unsigned int)irq; spin_lock_init(&vop->reg_lock); spin_lock_init(&vop->irq_lock); |