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

Changed files
+12 -4
drivers
gpu
drm
+7
MAINTAINERS
··· 3413 3413 F: drivers/gpu/drm/shmobile/ 3414 3414 F: include/linux/platform_data/shmob_drm.h 3415 3415 3416 + DRM DRIVERS FOR ROCKCHIP 3417 + M: Mark Yao <mark.yao@rock-chips.com> 3418 + L: dri-devel@lists.freedesktop.org 3419 + S: Maintained 3420 + F: drivers/gpu/drm/rockchip/ 3421 + F: Documentation/devicetree/bindings/video/rockchip* 3422 + 3416 3423 DSBR100 USB FM RADIO DRIVER 3417 3424 M: Alexey Klimov <klimov.linux@gmail.com> 3418 3425 L: linux-media@vger.kernel.org
+5 -4
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
··· 1409 1409 struct vop *vop; 1410 1410 struct resource *res; 1411 1411 size_t alloc_size; 1412 - int ret; 1412 + int ret, irq; 1413 1413 1414 1414 of_id = of_match_device(vop_driver_dt_match, dev); 1415 1415 vop_data = of_id->data; ··· 1445 1445 return ret; 1446 1446 } 1447 1447 1448 - vop->irq = platform_get_irq(pdev, 0); 1449 - if (vop->irq < 0) { 1448 + irq = platform_get_irq(pdev, 0); 1449 + if (irq < 0) { 1450 1450 dev_err(dev, "cannot find irq for vop\n"); 1451 - return vop->irq; 1451 + return irq; 1452 1452 } 1453 + vop->irq = (unsigned int)irq; 1453 1454 1454 1455 spin_lock_init(&vop->reg_lock); 1455 1456 spin_lock_init(&vop->irq_lock);