---

yaml --- r: 307476 b: refs/heads/master c: 7eb3b2c h: refs/heads/master v: v3
git-mirror · May 22, 2012 · d100c81 · d100c81
1 parent 65b3881
commit d100c81
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);