p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Dave Airlie 2015-05-04 08:56:27 +10:00
parent feb589e986 3ea68922fc
commit df9ebeb2da
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MAINTAINERS
View File

@ -3413,6 +3413,13 @@ F: drivers/gpu/drm/rcar-du/
F: drivers/gpu/drm/shmobile/ F: drivers/gpu/drm/shmobile/
F: include/linux/platform_data/shmob_drm.h 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 DSBR100 USB FM RADIO DRIVER
M: Alexey Klimov <klimov.linux@gmail.com> M: Alexey Klimov <klimov.linux@gmail.com>
L: linux-media@vger.kernel.org L: linux-media@vger.kernel.org

9
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
View File

@ -1409,7 +1409,7 @@ static int vop_bind(struct device *dev, struct device *master, void *data)
struct vop *vop; struct vop *vop;
struct resource *res; struct resource *res;
size_t alloc_size; size_t alloc_size;
int ret; int ret, irq;
of_id = of_match_device(vop_driver_dt_match, dev); of_id = of_match_device(vop_driver_dt_match, dev);
vop_data = of_id->data; vop_data = of_id->data;
@ -1445,11 +1445,12 @@ static int vop_bind(struct device *dev, struct device *master, void *data)
return ret; return ret;
} }
vop->irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
if (vop->irq < 0) { if (irq < 0) {
dev_err(dev, "cannot find irq for vop\n"); 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->reg_lock);
spin_lock_init(&vop->irq_lock); spin_lock_init(&vop->irq_lock);