diff --git a/.pick_status.json b/.pick_status.json
index 4be6425a390..9b612f8d1fa 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3424,7 +3424,7 @@
         "description": "vulkan/drm-syncobj: Stop returning early waiting for sync files",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/vulkan/runtime/vk_drm_syncobj.c b/src/vulkan/runtime/vk_drm_syncobj.c
index d0fd0309670..d1219731c5c 100644
--- a/src/vulkan/runtime/vk_drm_syncobj.c
+++ b/src/vulkan/runtime/vk_drm_syncobj.c
@@ -186,6 +186,9 @@ spin_wait_for_sync_file(struct vk_device *device,
       for (uint32_t i = 0; i < wait_count; i++) {
          while (1) {
             VkResult result = sync_has_sync_file(device, waits[i].sync);
+            if (result == VK_SUCCESS)
+               break; /* Break out of the inner while */
+
             if (result != VK_TIMEOUT)
                return result;