From 2035b4bfa47ccdf040078bd8f18ad53d293ffb9f Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@starflyer.(none)>
Date: Mon, 2 Jan 2006 19:23:44 +1100
Subject: [PATCH] --- yaml --- r: 18249 b: refs/heads/master c:
 b5e9fc13dd0f25a2f422000c185f491bfd4f7335 h: refs/heads/master i:   18247:
 c8ec416de1395b3335c29e2cebd5a4eef7d201ff v: v3

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

diff --git a/[refs] b/[refs]
index 3245c01cd87b..ecdff8c7811c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f26c473cdf557ea6e8f267d34eee82d30473a363
+refs/heads/master: b5e9fc13dd0f25a2f422000c185f491bfd4f7335
diff --git a/trunk/drivers/char/drm/drm_context.c b/trunk/drivers/char/drm/drm_context.c
index bdd168d88f49..7a7bcef2aa84 100644
--- a/trunk/drivers/char/drm/drm_context.c
+++ b/trunk/drivers/char/drm/drm_context.c
@@ -432,6 +432,10 @@ int drm_addctx(struct inode *inode, struct file *filp,
 
 	if (ctx.handle != DRM_KERNEL_CONTEXT) {
 		if (dev->driver->context_ctor)
+			if (dev->driver->context_ctor(dev, ctx.handle)) {
+				DRM_DEBUG("Running out of ctxs or memory.\n");
+				return -ENOMEM;
+			}
 			dev->driver->context_ctor(dev, ctx.handle);
 	}