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-11 15:32:32 +0200
commitaa42be211646b790a061768587ce5af26d828eca (patch)
treed65615a1d3c1b663908b2ae9ccc92986d1066990
parentaf224c2eeda2bd6679355f588766c5a8da8920a2 (diff)
downloadlinux-aa42be211646b790a061768587ce5af26d828eca.tar.gz
linux-aa42be211646b790a061768587ce5af26d828eca.tar.bz2
linux-aa42be211646b790a061768587ce5af26d828eca.zip
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 0f64c0a1d4b3..fef38ea146a2 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -599,6 +599,7 @@ fini:
drm_fb_helper_fini(&fbcon->helper);
free:
kfree(fbcon);
+ drm->fbcon = NULL;
return ret;
}