From 82703434e1fbf16848fb9b3667ea7d48daf68869 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 24 Jan 2011 12:34:00 +0000
Subject: [PATCH] --- yaml --- r: 232341 b: refs/heads/master c:
 8e934dbf264418afe4d1dff34ce074ecc14280db h: refs/heads/master i:   232339:
 89b8c7ca09a3139a01a7e400fc3404ee0ef9a06d v: v3

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

diff --git a/[refs] b/[refs]
index 5846e48e2ec2..94180cffed33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b705120e4198315f4ae043de06c62f65e0851fd3
+refs/heads/master: 8e934dbf264418afe4d1dff34ce074ecc14280db
diff --git a/trunk/drivers/gpu/drm/i915/i915_irq.c b/trunk/drivers/gpu/drm/i915/i915_irq.c
index 4b5a35c88bec..062f353497e6 100644
--- a/trunk/drivers/gpu/drm/i915/i915_irq.c
+++ b/trunk/drivers/gpu/drm/i915/i915_irq.c
@@ -846,6 +846,8 @@ static void i915_capture_error_state(struct drm_device *dev)
 		i++;
 	error->pinned_bo_count = i - error->active_bo_count;
 
+	error->active_bo = NULL;
+	error->pinned_bo = NULL;
 	if (i) {
 		error->active_bo = kmalloc(sizeof(*error->active_bo)*i,
 					   GFP_ATOMIC);