From 44084dc2893b8362b3fc7f885a7e2e6f739f6801 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Tue, 2 Feb 2010 14:40:30 -0800
Subject: [PATCH] --- yaml --- r: 180480 b: refs/heads/master c:
 7dad9ef6d9255b4d2d0a26305a785a55f3ba55e3 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_grctx.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c37bce8cd199..0639f070a33c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0fbe3eb5f65fe5948219f4ceac68f8a665b1fc6
+refs/heads/master: 7dad9ef6d9255b4d2d0a26305a785a55f3ba55e3
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_grctx.c b/trunk/drivers/gpu/drm/nouveau/nouveau_grctx.c
index 419f4c2b3b89..c7ebec696747 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_grctx.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_grctx.c
@@ -97,8 +97,8 @@ nouveau_grctx_prog_load(struct drm_device *dev)
 		}
 
 		pgraph->ctxvals = kmalloc(fw->size, GFP_KERNEL);
-		if (!pgraph->ctxprog) {
-			NV_ERROR(dev, "OOM copying ctxprog\n");
+		if (!pgraph->ctxvals) {
+			NV_ERROR(dev, "OOM copying ctxvals\n");
 			release_firmware(fw);
 			nouveau_grctx_fini(dev);
 			return -ENOMEM;