From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu, 11 Apr 2013 23:22:33 +0000 (+0100)
Subject: nvc0: set ret variable if launch desc allocation failed
X-Git-Tag: mesa-9.2.1~1804
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ac1118d53c0b22db8dcd6fcdcd2d1a245037dbc1;p=platform%2Fupstream%2Fmesa.git

nvc0: set ret variable if launch desc allocation failed

Pointed out by gcc

nve4_compute.c: In function 'nve4_launch_grid':
nve4_compute.c:511:7: warning: 'ret' may be used uninitialized in
 this function [-Wmaybe-uninitialized]
    if (ret)
       ^

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

Edit by Christoph Bumiller:
Set it to -1 to indicate failure and only when it's actually required.
---

diff --git a/src/gallium/drivers/nvc0/nve4_compute.c b/src/gallium/drivers/nvc0/nve4_compute.c
index 7ea61e8..106fb7a 100644
--- a/src/gallium/drivers/nvc0/nve4_compute.c
+++ b/src/gallium/drivers/nvc0/nve4_compute.c
@@ -469,8 +469,10 @@ nve4_launch_grid(struct pipe_context *pipe,
    int ret;
 
    desc = nve4_compute_alloc_launch_desc(&nvc0->base, &desc_bo, &desc_gpuaddr);
-   if (!desc)
+   if (!desc) {
+      ret = -1;
       goto out;
+   }
    BCTX_REFN_bo(nvc0->bufctx_cp, CP_DESC, NOUVEAU_BO_GART | NOUVEAU_BO_RD,
                 desc_bo);