1 files changed, 6 insertions, 5 deletions

diff --git a/etnaviv/etnaviv_bo.c b/etnaviv/etnaviv_bo.c
index 4ad0434e..32f7b348 100644
--- a/etnaviv/etnaviv_bo.c
+++ b/etnaviv/etnaviv_bo.c
@@ -24,10 +24,6 @@
  *    Christian Gmeiner <christian.gmeiner@gmail.com>
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include "etnaviv_priv.h"
 #include "etnaviv_drmif.h"
 
@@ -173,7 +169,7 @@ struct etna_bo *etna_bo_from_name(struct etna_device *dev, uint32_t name)
         pthread_mutex_lock(&table_lock);
 
         /* check name table first, to see if bo is already open: */
-        bo = lookup_bo(dev->name_table, req.handle);
+        bo = lookup_bo(dev->name_table, name);
         if (bo)
                 goto out_unlock;
 
@@ -206,10 +202,15 @@ struct etna_bo *etna_bo_from_dmabuf(struct etna_device *dev, int fd)
         int ret, size;
         uint32_t handle;
 
+        /* take the lock before calling drmPrimeFDToHandle to avoid
+         * racing against etna_bo_del, which might invalidate the
+         * returned handle.
+         */
         pthread_mutex_lock(&table_lock);
 
         ret = drmPrimeFDToHandle(dev->fd, fd, &handle);
         if (ret) {
+                pthread_mutex_unlock(&table_lock);
                 return NULL;
         }