From be16e93537d746365a43479de3a997af7969bb84 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Sun, 4 Dec 2005 01:24:23 +0000
Subject: Fix from SuSE for issue with context creation failure

---
 linux-core/drm_context.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'linux-core/drm_context.c')

diff --git a/linux-core/drm_context.c b/linux-core/drm_context.c
index 5947c8e6..b8702e6d 100644
--- a/linux-core/drm_context.c
+++ b/linux-core/drm_context.c
@@ -431,7 +431,10 @@ int drm_addctx(struct inode *inode, struct file *filp,
 
 	if (ctx.handle != DRM_KERNEL_CONTEXT) {
 		if (dev->driver->context_ctor)
-			dev->driver->context_ctor(dev, ctx.handle);
+			if (!dev->driver->context_ctor(dev, ctx.handle)) {
+				DRM_DEBUG("Running out of ctxs or memory.\n");
+				return -ENOMEM;
+			}
 	}
 
 	ctx_entry = drm_alloc(sizeof(*ctx_entry), DRM_MEM_CTXLIST);
-- 
cgit v1.2.3