From: Shuhao Fu <sfual@cse.ust.hk>
Date: Tue, 7 Oct 2025 16:17:09 +0000 (+0800)
Subject: drm/nouveau: fix bad ret code in nouveau_bo_move_prep
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e4bea919584ff292c9156cf7d641a2ab3cbe27b0;p=users%2Fhch%2Fmisc.git

drm/nouveau: fix bad ret code in nouveau_bo_move_prep

In `nouveau_bo_move_prep`, if `nouveau_mem_map` fails, an error code
should be returned. Currently, it returns zero even if vmm addr is not
correctly mapped.

Cc: stable@vger.kernel.org
Reviewed-by: Petr Vorel <pvorel@suse.cz>
Signed-off-by: Shuhao Fu <sfual@cse.ust.hk>
Fixes: 9ce523cc3bf2 ("drm/nouveau: separate buffer object backing memory from nvkm structures")
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index b96f0555ca14..f26562eafffc 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -929,7 +929,7 @@ done:
 		nvif_vmm_put(vmm, &old_mem->vma[1]);
 		nvif_vmm_put(vmm, &old_mem->vma[0]);
 	}
-	return 0;
+	return ret;
 }
 
 static int