From 95f3dcf008ee0dee9adee67cea39bd711151cfa4 Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Wed, 23 Sep 2009 15:57:33 -0700
Subject: [PATCH] --- yaml --- r: 165714 b: refs/heads/master c:
 9e5f1138d76e45b0ce56314ba0587e5942b55dcc h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/misc/sgi-gru/grukservices.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index dd7be149ac6c..b7946760d883 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8679af874b604db78d59d2a0a873a7f3d542842
+refs/heads/master: 9e5f1138d76e45b0ce56314ba0587e5942b55dcc
diff --git a/trunk/drivers/misc/sgi-gru/grukservices.c b/trunk/drivers/misc/sgi-gru/grukservices.c
index 79689b10f937..766e21e15574 100644
--- a/trunk/drivers/misc/sgi-gru/grukservices.c
+++ b/trunk/drivers/misc/sgi-gru/grukservices.c
@@ -937,6 +937,8 @@ static int quicktest1(unsigned long arg)
 
 	/* Need  1K cacheline aligned that does not cross page boundary */
 	p = kmalloc(4096, 0);
+	if (p == NULL)
+		return -ENOMEM;
 	mq = ALIGNUP(p, 1024);
 	memset(mes, 0xee, sizeof(mes));
 	dw = mq;