From b591b7372259cdbadc0732da5243e55eab457697 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun, 29 Jan 2012 16:45:32 +0000
Subject: [PATCH] --- yaml --- r: 286963 b: refs/heads/master c:
 dd8bc93d45c0ac4f64bf074d4be72418aac1609b h: refs/heads/master i:   286961:
 c5d3cd358230f23000bfab05af21264daf1eca1c   286959:
 529594ad4b96889c402daf203297f7a116fd8cfb v: v3

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

diff --git a/[refs] b/[refs]
index 5893187d5956..1bc5e05ab53e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e877b576ddf7cde5db2e9a6dcb56fef0ea77e64
+refs/heads/master: dd8bc93d45c0ac4f64bf074d4be72418aac1609b
diff --git a/trunk/drivers/gpu/drm/drm_gem.c b/trunk/drivers/gpu/drm/drm_gem.c
index 396e60ce8114..f8625e290728 100644
--- a/trunk/drivers/gpu/drm/drm_gem.c
+++ b/trunk/drivers/gpu/drm/drm_gem.c
@@ -140,7 +140,7 @@ int drm_gem_object_init(struct drm_device *dev,
 	obj->dev = dev;
 	obj->filp = shmem_file_setup("drm mm object", size, VM_NORESERVE);
 	if (IS_ERR(obj->filp))
-		return -ENOMEM;
+		return PTR_ERR(obj->filp);
 
 	kref_init(&obj->refcount);
 	atomic_set(&obj->handle_count, 0);