summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2020-07-24 09:01:39 +0200
committerBen Skeggs <bskeggs@redhat.com>2020-07-24 10:33:14 +0200
commit498595abf5bd51f0ae074cec565d888778ea558f (patch)
tree500aeb3f0619ac6d944bc5a8a13fe41976a3e5c3 /drivers/gpu
parentdrm/nouveau/kms/tu102: wait for core update to complete when assigning windows (diff)
downloadlinux-498595abf5bd51f0ae074cec565d888778ea558f.tar.xz
linux-498595abf5bd51f0ae074cec565d888778ea558f.zip
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>
Diffstat (limited to 'drivers/gpu')
-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 3d11b84d4cf9..843928ec059e 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;
}