Commit df9ebeb2 authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents feb589e9 3ea68922

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/rockchip/rockchip_drm_vop.c

+5 −4
Original line number Diff line number Diff line
@@ -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);