diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2015-02-02 13:38:03 +0100 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2015-02-02 13:38:03 +0100 |
| commit | 43328a22788c8d856f30a9b0b909e00b7a0c6ecc (patch) | |
| tree | 1ef1604ea6a297c5b83d3821ba19757946d7e67f /drivers/gpu/drm/drm_irq.c | |
| parent | 7a615209551c7a9f3a0dea4f6341ebbb2f2dc9c9 (diff) | |
| parent | c2d6598eefba9cbe5ca69ab6ca59e31f797169ac (diff) | |
Merge tag 'v3.18.5' into toradex_vf_3.18-next
This is the 3.18.5 stable release
Conflicts:
arch/arm/mach-imx/clk-imx6q.c
Diffstat (limited to 'drivers/gpu/drm/drm_irq.c')
| -rw-r--r-- | drivers/gpu/drm/drm_irq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 5ef03c216a27..c4edea907f8f 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -1029,7 +1029,8 @@ void drm_vblank_put(struct drm_device *dev, int crtc) { struct drm_vblank_crtc *vblank = &dev->vblank[crtc]; - BUG_ON(atomic_read(&vblank->refcount) == 0); + if (WARN_ON(atomic_read(&vblank->refcount) == 0)) + return; if (WARN_ON(crtc >= dev->num_crtcs)) return; |