浏览代码

pm3fb: switching between X and fb fix

This patch correctly restores console state after switching from X.
Otherwise, screen is always off after switching from X.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Krzysztof Helt 18 年之前
父节点
当前提交
0bd327ef28
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      drivers/video/pm3fb.c

+ 1 - 1
drivers/video/pm3fb.c

@@ -498,7 +498,7 @@ static int pm3fb_set_par(struct fb_info *info)
 	else
 		par->video |= PM3VideoControl_LINE_DOUBLE_OFF;
 
-	if (info->var.activate == FB_ACTIVATE_NOW)
+	if ((info->var.activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW)
 		par->video |= PM3VideoControl_ENABLE;
 	else {
 		par->video |= PM3VideoControl_DISABLE;