[src/riastradh-drm2]: src/sys/external/bsd/drm2/dist/drm/i915 More error bran...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f1a0bb0ddf93
branches:  riastradh-drm2
changeset: 788541:f1a0bb0ddf93
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Sep 08 16:02:21 2013 +0000

description:
More error branch cleanup.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r e41e38dfde46 -r f1a0bb0ddf93 sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c    Sun Sep 08 16:01:49 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c    Sun Sep 08 16:02:21 2013 +0000
@@ -1180,12 +1180,12 @@
        if (I915_NEED_GFX_HWS(dev)) {
                ret = init_status_page(ring);
                if (ret)
-                       return ret;
+                       goto err_waitqueue;
        } else {
                BUG_ON(ring->id != RCS);
                ret = init_phys_hws_pga(ring);
                if (ret)
-                       return ret;
+                       goto err_waitqueue;
        }
 
        obj = i915_gem_alloc_object(dev, ring->size);
@@ -1254,6 +1254,10 @@
        ring->obj = NULL;
 err_hws:
        cleanup_status_page(ring);
+err_waitqueue:
+#ifdef __NetBSD__
+       DRM_DESTROY_WAITQUEUE(&ring->irq_queue);
+#endif
        return ret;
 }