Mesa (nvc0): nouveau: fix fence_ref() where fence and *ref are the same fence

[Ben Skeggs]

Module: Mesa
Branch: nvc0
Commit: 3a38a4b0a8caae9be9a66f10e12ad41a1806037f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3a38a4b0a8caae9be9a66f10e12ad41a1806037f

Author: Ben Skeggs <bskeggs at redhat.com>
Date:   Tue Mar  1 10:43:44 2011 +1000

nouveau: fix fence_ref() where fence and *ref are the same fence

Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

---

 src/gallium/drivers/nouveau/nouveau_fence.h |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nouveau_fence.h b/src/gallium/drivers/nouveau/nouveau_fence.h
index 785fc8d..680c75e 100644
--- a/src/gallium/drivers/nouveau/nouveau_fence.h
+++ b/src/gallium/drivers/nouveau/nouveau_fence.h
@@ -39,12 +39,13 @@ boolean nouveau_fence_signalled(struct nouveau_fence *);
 static INLINE void
 nouveau_fence_ref(struct nouveau_fence *fence, struct nouveau_fence **ref)
 {
+   if (fence)
+      ++fence->ref;
+
    if (*ref) {
       if (--(*ref)->ref == 0)
          nouveau_fence_del(*ref);
    }
-   if (fence)
-      ++fence->ref;
 
    *ref = fence;
 }