From 132da9755ffca0934f358ae0415db290d5ad652d Mon Sep 17 00:00:00 2001
From: Rob Clark <rob@ti.com>
Date: Fri, 9 Dec 2011 23:26:06 -0600
Subject: [PATCH] --- yaml --- r: 281348 b: refs/heads/master c:
 b369839b88d6ffd9ad5b4f9362d6bb09a0e16c10 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/staging/omapdrm/omap_gem.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a358fb031042..bd26fa2c2a10 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16772a495ab4ee2f99b3f0094907b00d263620de
+refs/heads/master: b369839b88d6ffd9ad5b4f9362d6bb09a0e16c10
diff --git a/trunk/drivers/staging/omapdrm/omap_gem.c b/trunk/drivers/staging/omapdrm/omap_gem.c
index 1054da3b2d25..a451c572a59d 100644
--- a/trunk/drivers/staging/omapdrm/omap_gem.c
+++ b/trunk/drivers/staging/omapdrm/omap_gem.c
@@ -1094,6 +1094,10 @@ void omap_gem_init(struct drm_device *dev)
 	}
 
 	usergart = kzalloc(3 * sizeof(*usergart), GFP_KERNEL);
+	if (!usergart) {
+		dev_warn(dev->dev, "could not allocate usergart\n");
+		return;
+	}
 
 	/* reserve 4k aligned/wide regions for userspace mappings: */
 	for (i = 0; i < ARRAY_SIZE(fmts); i++) {