From 8633aac5845cc06c33347aee2b4c49c15048f68d Mon Sep 17 00:00:00 2001
From: Karol Herbst <kherbst@redhat.com>
Date: Thu, 22 Sep 2022 20:27:23 +0200
Subject: [PATCH] nvk/device: fix order of error handling

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
---
 src/nouveau/vulkan/nvk_device.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nouveau/vulkan/nvk_device.c b/src/nouveau/vulkan/nvk_device.c
index 0334e6a80e5..be97b2985a2 100644
--- a/src/nouveau/vulkan/nvk_device.c
+++ b/src/nouveau/vulkan/nvk_device.c
@@ -239,10 +239,10 @@ nvk_CreateDevice(VkPhysicalDevice physicalDevice,
 
 fail_queue:
    nvk_queue_finish(device, &device->queue);
-fail_queue_submit:
-   pthread_cond_destroy(&device->queue_submit);
 fail_zero_page:
    nouveau_ws_bo_destroy(device->zero_page);
+fail_queue_submit:
+   pthread_cond_destroy(&device->queue_submit);
 fail_mutex:
    pthread_mutex_destroy(&device->mutex);
 fail_slm: