---

yaml --- r: 232341 b: refs/heads/master c: 8e934db h: refs/heads/master i: 232339: 89b8c7c v: v3
git-mirror · Jan 24, 2011 · 8270343 · 8270343
1 parent 89406ef
commit 8270343
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);