summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nvc0
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2013-04-12 00:22:33 +0100
committerChristoph Bumiller <[email protected]>2013-04-12 17:15:14 +0200
commitac1118d53c0b22db8dcd6fcdcd2d1a245037dbc1 (patch)
treed89f706be1f64b8dc5e078af969c514b2591aa2a /src/gallium/drivers/nvc0
parent48bcb94dc375af17ceee14693c7cb3fdbb7e2151 (diff)
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 <[email protected]> Edit by Christoph Bumiller: Set it to -1 to indicate failure and only when it's actually required.
Diffstat (limited to 'src/gallium/drivers/nvc0')
-rw-r--r--src/gallium/drivers/nvc0/nve4_compute.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/drivers/nvc0/nve4_compute.c b/src/gallium/drivers/nvc0/nve4_compute.c
index 7ea61e809d1..106fb7a4a60 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);