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

Ben Skeggs · Ben Skeggs · commit 498595abf5bd · 2020-07-24T18:33:14.000+10:00
Stale pointer was tripping up the unload path.

Signed-off-by: Ben Skeggs &lt;bskeggs@redhat.com&gt;
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -590,6 +590,7 @@ nouveau_fbcon_init(struct drm_device *dev)
 	drm_fb_helper_fini(&fbcon->helper);
 free:
 	kfree(fbcon);
+	drm->fbcon = NULL;
 	return ret;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -590,6 +590,7 @@ nouveau_fbcon_init(struct drm_device *dev)`
`590`	`590`	`drm_fb_helper_fini(&fbcon->helper);`
`591`	`591`	`free:`
`592`	`592`	`kfree(fbcon);`
	`593`	`+ drm->fbcon = NULL;`
`593`	`594`	`return ret;`
`594`	`595`	`}`
`595`	`596`