From e903a7b0bbcadc8911e1b32addd6186acd548809 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Mon, 26 Feb 2018 13:34:54 +0000 Subject: [PATCH] vulkan/wsi: clean up cleanup path Signed-off-by: Eric Engestrom Reviewed-by: Keith Packard Reviewed-by: Emil Velikov --- src/vulkan/wsi/wsi_common.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/vulkan/wsi/wsi_common.c b/src/vulkan/wsi/wsi_common.c index edba13a13de..fe262b4968d 100644 --- a/src/vulkan/wsi/wsi_common.c +++ b/src/vulkan/wsi/wsi_common.c @@ -82,20 +82,20 @@ wsi_device_init(struct wsi_device *wsi, #ifdef VK_USE_PLATFORM_XCB_KHR result = wsi_x11_init_wsi(wsi, alloc); if (result != VK_SUCCESS) - return result; + goto fail; #endif #ifdef VK_USE_PLATFORM_WAYLAND_KHR result = wsi_wl_init_wsi(wsi, alloc, pdevice); - if (result != VK_SUCCESS) { -#ifdef VK_USE_PLATFORM_XCB_KHR - wsi_x11_finish_wsi(wsi, alloc); -#endif - return result; - } + if (result != VK_SUCCESS) + goto fail; #endif return VK_SUCCESS; + +fail: + wsi_device_finish(wsi, alloc); + return result; } void -- 2.30.2