summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2020-07-24 17:01:39 +1000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-08-21 10:52:56 +0200
commita7d7a54ed7a892cbf76313f15838b4690e7af674 (patch)
tree0305225b0688bc7c19864ab0d34396eb4fbc2c8f
parentd20fc4079f20f87fe6bda8b3dc0ac55e746346bb (diff)
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>
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_fbcon.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index 343476d15726..edb3a23ded5d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -566,6 +566,7 @@ fini:
drm_fb_helper_fini(&fbcon->helper);
free:
kfree(fbcon);
+ drm->fbcon = NULL;
return ret;
}