diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-05-04 08:56:27 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-05-04 08:56:27 +1000 |
| commit | df9ebeb2da3ae0122f44521ee833d31e1a2b3845 (patch) | |
| tree | ca7e4f26b87d4be57119bd25746ce1bb4b47388b | |
| parent | feb589e98671da59f9a3c337b8d9865957a7f9f8 (diff) | |
| parent | 3ea68922fc4148abc97557df43d4ba9a136b1c8d (diff) | |
| download | linux-df9ebeb2da3ae0122f44521ee833d31e1a2b3845.tar.bz2 | |
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
| -rw-r--r-- | MAINTAINERS | 7 | ||||
| -rw-r--r-- | drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 9 |
2 files changed, 12 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2e5bbc0d68b2..7171a4b8a268 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3413,6 +3413,13 @@ F: drivers/gpu/drm/rcar-du/ F: drivers/gpu/drm/shmobile/ F: include/linux/platform_data/shmob_drm.h +DRM DRIVERS FOR ROCKCHIP +M: Mark Yao <mark.yao@rock-chips.com> +L: dri-devel@lists.freedesktop.org +S: Maintained +F: drivers/gpu/drm/rockchip/ +F: Documentation/devicetree/bindings/video/rockchip* + DSBR100 USB FM RADIO DRIVER M: Alexey Klimov <klimov.linux@gmail.com> L: linux-media@vger.kernel.org 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); |