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);
 	}