From 5d0072ae7ee8f236346de103d558f59b4f9cd777 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Fri, 27 Sep 2024 09:11:39 +0200 Subject: [PATCH] panvk: Don't reset errno in panvk_kmod_zalloc() We shouldn't reset errno when the allocation succeeds, otherwise we might be overriding previous allocation failures. Signed-off-by: Boris Brezillon Reviewed-by: Mary Guillemard Part-of: --- src/panfrost/vulkan/panvk_instance.c | 3 ++- src/panfrost/vulkan/panvk_vX_device.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/panfrost/vulkan/panvk_instance.c b/src/panfrost/vulkan/panvk_instance.c index 05132fbbeee..4a0bd98b984 100644 --- a/src/panfrost/vulkan/panvk_instance.c +++ b/src/panfrost/vulkan/panvk_instance.c @@ -118,7 +118,8 @@ panvk_kmod_zalloc(const struct pan_kmod_allocator *allocator, size_t size, /* We force errno to -ENOMEM on host allocation failures so we can properly * report it back as VK_ERROR_OUT_OF_HOST_MEMORY. */ - errno = obj ? 0 : -ENOMEM; + if (!obj) + errno = -ENOMEM; return obj; } diff --git a/src/panfrost/vulkan/panvk_vX_device.c b/src/panfrost/vulkan/panvk_vX_device.c index 5a067bd96c2..a6407daabb1 100644 --- a/src/panfrost/vulkan/panvk_vX_device.c +++ b/src/panfrost/vulkan/panvk_vX_device.c @@ -42,7 +42,8 @@ panvk_kmod_zalloc(const struct pan_kmod_allocator *allocator, size_t size, /* We force errno to -ENOMEM on host allocation failures so we can properly * report it back as VK_ERROR_OUT_OF_HOST_MEMORY. */ - errno = obj ? 0 : -ENOMEM; + if (!obj) + errno = -ENOMEM; return obj; }