From 1e82c1ee51949973832d5fe8092f0f70adfc473b Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Fri, 15 Feb 2013 21:21:37 +0100
Subject: [PATCH] --- yaml --- r: 358195 b: refs/heads/master c:
 35f8badc1cf652381fa3f82c1fbea39f4dbe87fd h: refs/heads/master i:   358193:
 2e007c47e2973471813f11b7cde9f0da96c2a077   358191:
 548ee1fb71cb7254b51c6499e166554af32c1a41 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/gpu/drm/drm_crtc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c08d7767c689..d0d6c8ac273b 100644
--- 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
index f17077307c65..e7471b0880b7 100644
--- 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);