nouveau: cleanups + fixes

1 files changed, 9 insertions, 12 deletions

diff --git a/src/gallium/drivers/nouveau/nouveau_stateobj.h b/src/gallium/drivers/nouveau/nouveau_stateobj.h
index 07c31b014a5..459cc7d77ae 100644
--- a/src/gallium/drivers/nouveau/nouveau_stateobj.h
+++ b/src/gallium/drivers/nouveau/nouveau_stateobj.h
@@ -45,22 +45,19 @@ so_new(unsigned push, unsigned reloc)
 static INLINE void
 so_ref(struct nouveau_stateobj *ref, struct nouveau_stateobj **pso)
 {
-	struct nouveau_stateobj *so;
-
-	so = *pso;
-	if (so) {
-		if (--so->refcount <= 0) {
-			free(so->push);
-			free(so->reloc);
-			free(so);
-		}
-		*pso = NULL;
-	}
+	struct nouveau_stateobj *so = *pso;
 
 	if (ref) {
 		ref->refcount++;
-		*pso = ref;
 	}
+
+	if (so && --so->refcount <= 0) {
+		free(so->push);
+		free(so->reloc);
+		free(so);
+	}
+
+	*pso = ref;
 }
 
 static INLINE void