From 5dabdf3eeffe1538a67ceceb991b4f15aa4e17bf Mon Sep 17 00:00:00 2001
From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Date: Sat, 23 May 2020 02:36:03 +0200
Subject: [PATCH] radv: Do not close fd -1 when NULL-winsys creation fails.

Fixes: cd6ec2b1abb "radv: implement a dummy winsys for creating devices without AMDGPU"
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5181>
(cherry picked from commit a51ab5f95624d1c29d9592aa2212f80dead8ecdf)
---
 .pick_status.json            | 2 +-
 src/amd/vulkan/radv_device.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index d5cacff3fe5..132e3e70b1e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -859,7 +859,7 @@
         "description": "radv: Do not close fd -1 when NULL-winsys creation fails.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "cd6ec2b1abbd96f4456e92613c2232c919bb9023"
     },
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index f4922830a01..293a2fade65 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -407,7 +407,8 @@ radv_physical_device_init(struct radv_physical_device *device,
 	return VK_SUCCESS;
 
 fail:
-	close(fd);
+	if (fd != -1)
+		close(fd);
 	if (master_fd != -1)
 		close(master_fd);
 	return result;