From d100c81ed3302b7a364d070125c0c618252e6ed2 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Thu, 17 May 2012 13:27:19 +0200 Subject: [PATCH] --- yaml --- r: 307476 b: refs/heads/master c: 7eb3b2c83dccddec34787adf67c10c82331d262e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_irq.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8aa073d60e9d..bfa5db77eff5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af437cfd355275a62e45ce8281ef5cc57c953bbc +refs/heads/master: 7eb3b2c83dccddec34787adf67c10c82331d262e diff --git a/trunk/drivers/gpu/drm/drm_irq.c b/trunk/drivers/gpu/drm/drm_irq.c index c869436e238a..acd2cb45a513 100644 --- a/trunk/drivers/gpu/drm/drm_irq.c +++ b/trunk/drivers/gpu/drm/drm_irq.c @@ -189,7 +189,7 @@ void drm_vblank_cleanup(struct drm_device *dev) if (dev->num_crtcs == 0) return; - del_timer(&dev->vblank_disable_timer); + del_timer_sync(&dev->vblank_disable_timer); vblank_disable_fn((unsigned long)dev);