drm/nouveau: fix nouveau_client allocation failure path

[karo-tx-linux.git] / drivers / gpu / drm / nouveau / nv10_fence.c

diff --git a/drivers/gpu/drm/nouveau/nv10_fence.c b/drivers/gpu/drm/nouveau/nv10_fence.c
index ce752bf5cc4e1095b20cf8c3f789a2bfb88e0448..7ae7f97a6d4d84c273853d31bae664f16b7ca453 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv10_fence.c
+++ b/drivers/gpu/drm/nouveau/nv10_fence.c
@@ -155,6 +155,8 @@ nv10_fence_destroy(struct nouveau_drm *drm)
 {
        struct nv10_fence_priv *priv = drm->fence;
        nouveau_bo_unmap(priv->bo);
+       if (priv->bo)
+               nouveau_bo_unpin(priv->bo);
        nouveau_bo_ref(NULL, &priv->bo);
        drm->fence = NULL;
        kfree(priv);
@@ -183,8 +185,11 @@ nv10_fence_create(struct nouveau_drm *drm)
                                     0, 0x0000, NULL, &priv->bo);
                if (!ret) {
                        ret = nouveau_bo_pin(priv->bo, TTM_PL_FLAG_VRAM);
-                       if (!ret)
+                       if (!ret) {
                                ret = nouveau_bo_map(priv->bo);
+                               if (ret)
+                                       nouveau_bo_unpin(priv->bo);
+                       }
                        if (ret)
                                nouveau_bo_ref(NULL, &priv->bo);
                }