xf86-video-intel: src/sna/kgem.c

[Chris Wilson]

 src/sna/kgem.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 52c8c9218c8f28fb049b02214d833912a803f911
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Dec 12 21:19:02 2012 +0000

    sna: Fix the error path in kgem_init_pinned_batches() to use the right iter
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 52474c9..f1682da 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -846,6 +846,8 @@ static bool kgem_init_pinned_batches(struct kgem *kgem)
 			struct drm_i915_gem_pin pin;
 			struct kgem_bo *bo;
 
+			VG_CLEAR(pin);
+
 			pin.handle = gem_create(kgem->fd, size[n]);
 			if (pin.handle == 0)
 				goto err;
@@ -875,9 +877,9 @@ static bool kgem_init_pinned_batches(struct kgem *kgem)
 
 err:
 	for (n = 0; n < ARRAY_SIZE(kgem->pinned_batches); n++) {
-		while (!list_is_empty(&kgem->pinned_batches[i])) {
+		while (!list_is_empty(&kgem->pinned_batches[n])) {
 			kgem_bo_destroy(kgem,
-					list_first_entry(&kgem->pinned_batches[i],
+					list_first_entry(&kgem->pinned_batches[n],
 							 struct kgem_bo, list));
 		}
 	}