From 2773e55e865a08cb092046c89491d2caa55a7658 Mon Sep 17 00:00:00 2001
From: Emma Anholt <emma@anholt.net>
Date: Sat, 10 Sep 2022 22:22:12 -0700
Subject: [PATCH] nvk: Fix uninitialized result usage in NVK_DEBUG_ZERO_MEMORY.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
---
 src/nouveau/vulkan/nvk_device_memory.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/nouveau/vulkan/nvk_device_memory.c b/src/nouveau/vulkan/nvk_device_memory.c
index bd4b49e271c..d0ab1ee547a 100644
--- a/src/nouveau/vulkan/nvk_device_memory.c
+++ b/src/nouveau/vulkan/nvk_device_memory.c
@@ -121,8 +121,9 @@ nvk_allocate_memory(struct nvk_device *device,
          }
          memset(map, 0, mem->bo->size);
          nouveau_ws_bo_unmap(mem->bo, map);
+         result = VK_SUCCESS;
       } else {
-         VkResult result = zero_vram(device, mem->bo);
+         result = zero_vram(device, mem->bo);
          if (result != VK_SUCCESS)
             goto fail_bo;
       }