---

yaml --- r: 358195 b: refs/heads/master c: 35f8bad h: refs/heads/master i: 358193: 2e007c4 358191: 548ee1f v: v3
git-mirror · Feb 19, 2013 · 1e82c1e · 1e82c1e
1 parent 41d8802
commit 1e82c1e
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: 196e077dc165a307efbd9e7569f81bbdbcf18f65
+refs/heads/master: 35f8badc1cf652381fa3f82c1fbea39f4dbe87fd
diff --git a/trunk/drivers/gpu/drm/drm_crtc.c b/trunk/drivers/gpu/drm/drm_crtc.c
@@ -1996,9 +1996,9 @@ int drm_mode_setplane(struct drm_device *dev, void *data,
 					 plane_req->src_w, plane_req->src_h);
 	if (!ret) {
 		old_fb = plane->fb;
-		fb = NULL;
 		plane->crtc = crtc;
 		plane->fb = fb;
+		fb = NULL;
 	}
 	drm_modeset_unlock_all(dev);