diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c
index fafe2eed0de..65750f55461 100644
--- a/src/gallium/drivers/iris/iris_bufmgr.c
+++ b/src/gallium/drivers/iris/iris_bufmgr.c
@@ -2654,16 +2654,16 @@ iris_bufmgr_get_for_fd(int fd, bool bo_reuse)
    }
 
    if (!intel_get_device_info_from_fd(fd, &devinfo, 8, -1))
-      return NULL;
+      goto unlock;
 
    if (devinfo.ver < 8 || devinfo.platform == INTEL_PLATFORM_CHV)
-      return NULL;
+      goto unlock;
 
 #ifndef INTEL_USE_ELK
    if (devinfo.ver < 9) {
       WARN_ONCE(devinfo.ver == 8,
                 "ERROR: Iris was compiled without support for Gfx version 8.\n");
-      return NULL;
+      goto unlock;
    }
 #endif