---

yaml --- r: 307057 b: refs/heads/master c: ec34a01 h: refs/heads/master i: 307055: 8e99811 v: v3
git-mirror · Apr 9, 2012 · dde17fc · dde17fc
1 parent be44980
commit dde17fc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 618563e3945b9d0864154bab3c607865b557cecc
+refs/heads/master: ec34a01de31128e5c08e5f05c47f4a787f45a33c
diff --git a/trunk/drivers/gpu/drm/i915/i915_debugfs.c b/trunk/drivers/gpu/drm/i915/i915_debugfs.c
@@ -742,7 +742,7 @@ static void i915_ring_error_state(struct seq_file *m,
 				  struct drm_i915_error_state *error,
 				  unsigned ring)
 {
-	BUG_ON(ring > VCS); /* shut up confused gcc */
+	BUG_ON(ring >= I915_NUM_RINGS); /* shut up confused gcc */
 	seq_printf(m, "%s command stream:\n", ring_str(ring));
 	seq_printf(m, "  HEAD: 0x%08x\n", error->head[ring]);
 	seq_printf(m, "  TAIL: 0x%08x\n", error->tail[ring]);