From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu, 16 Jan 2014 17:36:43 +0000 (+0000)
Subject: nv50: drop obsolete check from error path
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=66fd5057d3ee1b3a7bce484eb0856b318a8ae4a4;p=mesa.git

nv50: drop obsolete check from error path

At 'out_err' the nv50_context has been calloc-ated.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
---

diff --git a/src/gallium/drivers/nouveau/nv50/nv50_context.c b/src/gallium/drivers/nouveau/nv50/nv50_context.c
index 24264d5adbe..10e8b47b38e 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_context.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_context.c
@@ -298,15 +298,13 @@ nv50_create(struct pipe_screen *pscreen, void *priv)
    return pipe;
 
 out_err:
-   if (nv50) {
-      if (nv50->bufctx_3d)
-         nouveau_bufctx_del(&nv50->bufctx_3d);
-      if (nv50->bufctx)
-         nouveau_bufctx_del(&nv50->bufctx);
-      if (nv50->blit)
-         FREE(nv50->blit);
-      FREE(nv50);
-   }
+   if (nv50->bufctx_3d)
+      nouveau_bufctx_del(&nv50->bufctx_3d);
+   if (nv50->bufctx)
+      nouveau_bufctx_del(&nv50->bufctx);
+   if (nv50->blit)
+      FREE(nv50->blit);
+   FREE(nv50);
    return NULL;
 }