From: Christian König <christian.koenig@amd.com>
Date: Thu, 26 Nov 2020 12:35:08 +0000 (+0100)
Subject: drm/nouveau: make sure ret is initialized in nouveau_ttm_io_mem_reserve
X-Git-Tag: v5.10-rc7~19^2^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aea656b0d05ec5b8ed5beb2f94c4dd42ea834e9d;p=thirdparty%2Fkernel%2Flinux.git

drm/nouveau: make sure ret is initialized in nouveau_ttm_io_mem_reserve

This wasn't initialized for pre NV50 hardware.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reported-and-Tested-by: Mark Hounschell <markh@compro.net>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Link: https://patchwork.freedesktop.org/series/84298/
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 2ee75646ad6fc..d02f3a58adb68 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -1215,8 +1215,8 @@ retry:
 			}
 
 			reg->bus.offset = handle;
-			ret = 0;
 		}
+		ret = 0;
 		break;
 	default:
 		ret = -EINVAL;