---

yaml --- r: 345409 b: refs/heads/master c: d6bf2f3 h: refs/heads/master i: 345407: 08977de v: v3
git-mirror · Nov 28, 2012 · 0844828 · 0844828
1 parent a08c155
commit 0844828
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94e5c39bad56a7b097d3b168b90a72cc1633c8f1
+refs/heads/master: d6bf2f370703c0cab60bf1f5bf871a3f00eb8872
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_display.c b/trunk/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -400,11 +400,12 @@ nouveau_display_destroy(struct drm_device *dev)
 	nouveau_backlight_exit(dev);
 	drm_vblank_cleanup(dev);
 
+	drm_kms_helper_poll_fini(dev);
+	drm_mode_config_cleanup(dev);
+
 	if (disp->dtor)
 		disp->dtor(dev);
 
-	drm_kms_helper_poll_fini(dev);
-	drm_mode_config_cleanup(dev);
 	nouveau_drm(dev)->display = NULL;
 	kfree(disp);
 }