Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

[linux-2.6-microblaze.git] / drivers / gpu / drm / nouveau / nouveau_vmm.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_vmm.c b/drivers/gpu/drm/nouveau/nouveau_vmm.c
index a6602c0..3dda885 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_vmm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_vmm.c
@@ -108,6 +108,9 @@ nouveau_vma_new(struct nouveau_bo *nvbo, struct nouveau_vmm *vmm,
        } else {
                ret = nvif_vmm_get(&vmm->vmm, PTES, false, mem->mem.page, 0,
                                   mem->mem.size, &tmp);
+               if (ret)
+                       goto done;
+
                vma->addr = tmp.addr;
        }