1 files changed, 10 insertions, 7 deletions

diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 8104ecaea26..ffe8f4394d5 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -134,26 +134,29 @@ drm_gem_object_alloc(struct drm_device *dev, size_t size)
         BUG_ON((size & (PAGE_SIZE - 1)) != 0);
 
         obj = kzalloc(sizeof(*obj), GFP_KERNEL);
+        if (!obj)
+                goto free;
 
         obj->dev = dev;
         obj->filp = shmem_file_setup("drm mm object", size, VM_NORESERVE);
-        if (IS_ERR(obj->filp)) {
-                kfree(obj);
-                return NULL;
-        }
+        if (IS_ERR(obj->filp))
+                goto free;
 
         kref_init(&obj->refcount);
         kref_init(&obj->handlecount);
         obj->size = size;
         if (dev->driver->gem_init_object != NULL &&
             dev->driver->gem_init_object(obj) != 0) {
-                fput(obj->filp);
-                kfree(obj);
-                return NULL;
+                goto fput;
         }
         atomic_inc(&dev->object_count);
         atomic_add(obj->size, &dev->object_memory);
         return obj;
+fput:
+        fput(obj->filp);
+free:
+        kfree(obj);
+        return NULL;
 }
 EXPORT_SYMBOL(drm_gem_object_alloc);