From b164e6cb4bd1287b16626a89c03958e7c3ec2388 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 30 Nov 2005 08:49:20 -0800
Subject: [PATCH] --- yaml --- r: 14827 b: refs/heads/master c:
 f8e988436b9d83b20bc5cc378f1a8034816ae6a6 h: refs/heads/master i:   14825:
 9710dd06577c7cbe0c293c34ffd4277a5bb81d9b   14823:
 dc97dd37fb9778256581c3503b71adaccc4debe2 v: v3

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

diff --git a/[refs] b/[refs]
index 1188e4c1ba10..736a6802ee37 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8926bfa7462d4c3f8b05cca929e0c4bcde93ae38
+refs/heads/master: f8e988436b9d83b20bc5cc378f1a8034816ae6a6
diff --git a/trunk/drivers/char/drm/drm_context.c b/trunk/drivers/char/drm/drm_context.c
index bdd168d88f49..bd958d69a2ac 100644
--- a/trunk/drivers/char/drm/drm_context.c
+++ b/trunk/drivers/char/drm/drm_context.c
@@ -432,7 +432,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);