---

yaml --- r: 318762 b: refs/heads/master c: 2e6c21e h: refs/heads/master v: v3
git-mirror · Jul 20, 2012 · 3ac3583 · 3ac3583
1 parent 24b091d
commit 3ac3583
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 796265235b47cb40ecfa906cb2c3206bd0d07431
+refs/heads/master: 2e6c21ed63af34059009c2ddfa44988d850fca7f
diff --git a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -972,6 +972,7 @@ static int init_status_page(struct intel_ring_buffer *ring)
 	ring->status_page.gfx_addr = obj->gtt_offset;
 	ring->status_page.page_addr = kmap(obj->pages[0]);
 	if (ring->status_page.page_addr == NULL) {
+		ret = -ENOMEM;
 		goto err_unpin;
 	}
 	ring->status_page.obj = obj;