From: Ben Skeggs <bskeggs@redhat.com>
Date: Fri, 24 Jul 2020 07:01:39 +0000 (+1000)
Subject: drm/nouveau/fbcon: fix module unload when fbcon init has failed for some reason
X-Git-Tag: v5.8~25^2~1^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=498595abf5bd51f0ae074cec565d888778ea558f;p=thirdparty%2Fkernel%2Flinux.git

drm/nouveau/fbcon: fix module unload when fbcon init has failed for some reason

Stale pointer was tripping up the unload path.

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

diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index 3d11b84d4cf9f..843928ec059e0 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -590,6 +590,7 @@ fini:
 	drm_fb_helper_fini(&fbcon->helper);
 free:
 	kfree(fbcon);
+	drm->fbcon = NULL;
 	return ret;
 }