From: Eric Anholt <eric@anholt.net>
Date: Thu, 18 Jun 2015 06:49:19 +0000 (-0700)
Subject: vc4: Fix memory leak from simple_list conversion.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dc1fbad2eb5454ed36a066d2a69b575cd5a8abaf;p=mesa.git

vc4: Fix memory leak from simple_list conversion.

I accidentally shadowed the outside declaration, so we always returned
NULL even when we'd found something in the cache.
---

diff --git a/src/gallium/drivers/vc4/vc4_bufmgr.c b/src/gallium/drivers/vc4/vc4_bufmgr.c
index eef7e9dc16f..cbdb9e89cf6 100644
--- a/src/gallium/drivers/vc4/vc4_bufmgr.c
+++ b/src/gallium/drivers/vc4/vc4_bufmgr.c
@@ -87,9 +87,8 @@ vc4_bo_from_cache(struct vc4_screen *screen, uint32_t size, const char *name)
         struct vc4_bo *bo = NULL;
         pipe_mutex_lock(cache->lock);
         if (!list_empty(&cache->size_list[page_index])) {
-                struct vc4_bo *bo = LIST_ENTRY(struct vc4_bo,
-                                               cache->size_list[page_index].next,
-                                               size_list);
+                bo = LIST_ENTRY(struct vc4_bo, cache->size_list[page_index].next,
+                                size_list);
 
                 /* Check that the BO has gone idle.  If not, then we want to
                  * allocate something new instead, since we assume that the