From de35412310b9e3993cc2abe116dfc9011603ba01 Mon Sep 17 00:00:00 2001
From: xueminsu <xuemin.su@intel.com>
Date: Tue, 22 Jan 2013 22:16:53 +0800
Subject: [PATCH] --- yaml --- r: 349355 b: refs/heads/master c:
 b2f4b03f8a378cd626d2ea67d19e7470c050a098 h: refs/heads/master i:   349353:
 f6ad80052e36130d8d04960ddc67ef799db74090   349351:
 e42f36c3789f1027dca415e31e509c06b544bd94 v: v3

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

diff --git a/[refs] b/[refs]
index eb462b888db9..b3b834e0f499 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e521a29014794d139cca46396d1af8faf1295a26
+refs/heads/master: b2f4b03f8a378cd626d2ea67d19e7470c050a098
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_display.c b/trunk/drivers/gpu/drm/radeon/radeon_display.c
index 1da2386d7cf7..ff3def784619 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_display.c
+++ b/trunk/drivers/gpu/drm/radeon/radeon_display.c
@@ -1122,7 +1122,7 @@ radeon_user_framebuffer_create(struct drm_device *dev,
 	if (ret) {
 		kfree(radeon_fb);
 		drm_gem_object_unreference_unlocked(obj);
-		return NULL;
+		return ERR_PTR(ret);
 	}
 
 	return &radeon_fb->base;