summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2012-07-13 08:16:12 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-07-20 12:21:40 +0200
commit2e6c21ed63af34059009c2ddfa44988d850fca7f (patch)
treea7f4c72eec7cb7ee846492538859924c06c7bdf9 /drivers/gpu
parentdrm/i915: mask tiled bit when updating ILK sprites (diff)
downloadlinux-2e6c21ed63af34059009c2ddfa44988d850fca7f.tar.xz
linux-2e6c21ed63af34059009c2ddfa44988d850fca7f.zip
drm/i915: missing error case in init status page
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index ddc48590ea60..bf0195a96d53 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/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;