From f8084fb95ec2b5f03d24c8ec06808e369f50e094 Mon Sep 17 00:00:00 2001 From: Mika Kuoppala Date: Mon, 22 Apr 2013 14:19:26 +0300 Subject: [PATCH] --- yaml --- r: 371554 b: refs/heads/master c: e6637d5427d2af9f3f33b95447bfc5347e5ccd85 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/console/fbcon.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5ab3090ec1bf..453835a58ade 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a397154e2240c928ebc2167d18c0b8ab7a7ac56 +refs/heads/master: e6637d5427d2af9f3f33b95447bfc5347e5ccd85 diff --git a/trunk/drivers/video/console/fbcon.c b/trunk/drivers/video/console/fbcon.c index 3cd675927826..a92783e480e6 100644 --- a/trunk/drivers/video/console/fbcon.c +++ b/trunk/drivers/video/console/fbcon.c @@ -1228,6 +1228,8 @@ static void fbcon_deinit(struct vc_data *vc) finished: fbcon_free_font(p, free_font); + if (free_font) + vc->vc_font.data = NULL; if (!con_is_bound(&fb_con)) fbcon_exit();