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.9.233~146
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=705a601e0561be274d34cb25545764a8abaa5bf8;p=platform%2Fkernel%2Flinux-amlogic.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 2b79e27dd89c..275abc424ce2 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -584,6 +584,7 @@ fini:
 	drm_fb_helper_fini(&fbcon->helper);
 free:
 	kfree(fbcon);
+	drm->fbcon = NULL;
 	return ret;
 }