From 5a05b0f043e97859d269ac0587c76c4acc927fc3 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 15 May 2012 11:56:59 +0300
Subject: [PATCH] --- yaml --- r: 307394 b: refs/heads/master c:
 ce0679136678a58cbeca40acd84b6a0462637454 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/gpu/drm/radeon/r100.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7ceff403e8cc..aeb7fc332ea6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bffd9de0297702566e6aec0678c7ebc3806fe3db
+refs/heads/master: ce0679136678a58cbeca40acd84b6a0462637454
diff --git a/trunk/drivers/gpu/drm/radeon/r100.c b/trunk/drivers/gpu/drm/radeon/r100.c
index 0874a6dd411f..fb44e7e49083 100644
--- a/trunk/drivers/gpu/drm/radeon/r100.c
+++ b/trunk/drivers/gpu/drm/radeon/r100.c
@@ -2008,6 +2008,8 @@ int r100_cs_parse(struct radeon_cs_parser *p)
 	int r;
 
 	track = kzalloc(sizeof(*track), GFP_KERNEL);
+	if (!track)
+		return -ENOMEM;
 	r100_cs_track_clear(p->rdev, track);
 	p->track = track;
 	do {