diff --git a/src/intel/tools/intel_dev_info.c b/src/intel/tools/intel_dev_info.c
index 9a1c7451d34..aef2cd9bebb 100644
--- a/src/intel/tools/intel_dev_info.c
+++ b/src/intel/tools/intel_dev_info.c
@@ -254,10 +254,11 @@ main(int argc, char *argv[])
             continue;
 
          bool success = intel_get_device_info_from_fd(fd, &devinfo, -1, -1);
-         close(fd);
 
-         if (!success)
+         if (!success) {
+            close(fd);
             continue;
+         }
 
          if (print_json) {
             JSON_Value *json = intel_device_info_dump_json(&devinfo);
@@ -276,6 +277,7 @@ main(int argc, char *argv[])
             printf("%s", pretty_string);
             json_free_serialized_string(pretty_string);
             json_value_free(json);
+            close(fd);
             continue;
          }
 
@@ -287,6 +289,8 @@ main(int argc, char *argv[])
             intel_get_and_print_hwconfig_table(fd, &devinfo);
          if (print_workarounds)
             print_wa_info(&devinfo);
+
+         close(fd);
       }
    }