diff --git a/.pick_status.json b/.pick_status.json
index 9d857bd0e4a..9614b2c158f 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1734,7 +1734,7 @@
         "description": "llvmpipe: Silence \"possibly uninitialized value\" warning for ssbo_limit (cont)",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "ce611935df5e7e6cc731523c7496c33ba6f7ef20",
         "notes": null
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
index 6b2a10e1b8a..42d8e588d1d 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
@@ -3848,7 +3848,7 @@ atomic_emit(
       LLVMValueRef atom_res = lp_build_alloca(gallivm,
                                               uint_bld->vec_type, "");
 
-      LLVMValueRef ssbo_limit;
+      LLVMValueRef ssbo_limit = NULL;
       if (!is_shared) {
          ssbo_limit = LLVMBuildAShr(gallivm->builder, bld->ssbo_sizes[buf], lp_build_const_int32(gallivm, 2), "");
          ssbo_limit = lp_build_broadcast_scalar(uint_bld, ssbo_limit);