From 520b29528dfa2cc5ac722a720b6824802872dff8 Mon Sep 17 00:00:00 2001 From: Antonino Daplas Date: Wed, 30 Mar 2005 16:44:30 -0800 Subject: [PATCH] pm2fb: X and VT switching crash fix From: Jim Hague This is a bug in pm2fb.c exposed by recent changes to fbcon. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/video/pm2fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c index 496624c277c1b..3fb987883b037 100644 --- a/drivers/video/pm2fb.c +++ b/drivers/video/pm2fb.c @@ -747,7 +747,7 @@ static int pm2fb_set_par(struct fb_info *info) } if ((info->var.vmode & FB_VMODE_MASK)==FB_VMODE_DOUBLE) video |= PM2F_LINE_DOUBLE; - if (info->var.activate==FB_ACTIVATE_NOW) + if ((info->var.activate & FB_ACTIVATE_MASK)==FB_ACTIVATE_NOW) video |= PM2F_VIDEO_ENABLE; par->video = video; -- cgit 1.2.3-korg