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: v4.14.194~206
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3793c4c127e34d1fded7e64158c1795b7f7d1983;p=users%2Fdwmw2%2Flinux.git

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

[ Upstream commit 498595abf5bd51f0ae074cec565d888778ea558f ]

Stale pointer was tripping up the unload path.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

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