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;