nvc0: set ret variable if launch desc allocation failed
authorEmil Velikov <emil.l.velikov@gmail.com>
Thu, 11 Apr 2013 23:22:33 +0000 (00:22 +0100)
committerChristoph Bumiller <christoph.bumiller@speed.at>
Fri, 12 Apr 2013 15:15:14 +0000 (17:15 +0200)
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.

src/gallium/drivers/nvc0/nve4_compute.c

index 7ea61e809d138757243cf46dc445e4c6d2e1d17c..106fb7a4a60a84ce754dbc9d0506dd6ada0d29c8 100644 (file)
@@ -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);