1 files changed, 4 insertions, 7 deletions

diff --git a/freedreno/freedreno_device.c b/freedreno/freedreno_device.c
index fcbf1402..0b42561a 100644
--- a/freedreno/freedreno_device.c
+++ b/freedreno/freedreno_device.c
@@ -26,10 +26,6 @@
  *    Rob Clark <robclark@freedesktop.org>
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -65,7 +61,7 @@ struct fd_device * fd_device_new(int fd)
 
                 dev = msm_device_new(fd);
                 dev->version = version->version_minor;
-#ifdef HAVE_FREEDRENO_KGSL
+#if HAVE_FREEDRENO_KGSL
         } else if (!strcmp(version->name, "kgsl")) {
                 DEBUG_MSG("kgsl DRM device");
                 dev = kgsl_device_new(fd);
@@ -112,12 +108,13 @@ struct fd_device * fd_device_ref(struct fd_device *dev)
 
 static void fd_device_del_impl(struct fd_device *dev)
 {
+        int close_fd = dev->closefd ? dev->fd : -1;
         fd_bo_cache_cleanup(&dev->bo_cache, 0);
         drmHashDestroy(dev->handle_table);
         drmHashDestroy(dev->name_table);
-        if (dev->closefd)
-                close(dev->fd);
         dev->funcs->destroy(dev);
+        if (close_fd >= 0)
+                close(close_fd);
 }
 
 drm_private void fd_device_del_locked(struct fd_device *dev)