aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/pm3fb.c
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2007-06-01 03:47:09 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-01 11:18:30 -0400
commit0bd327ef288923f4188050bae295661ed0fbb3fb (patch)
treed53ad395a09d1ee7e368dfad8f2d7f1166fda8c5 /drivers/video/pm3fb.c
parent27390bc335ff86d92c3819cc28035fde23d1a9c2 (diff)
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>
Diffstat (limited to 'drivers/video/pm3fb.c')
-rw-r--r--drivers/video/pm3fb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c
index 616a0c08e30c..b52e883f0a52 100644
--- a/drivers/video/pm3fb.c
+++ b/drivers/video/pm3fb.c
@@ -498,7 +498,7 @@ static int pm3fb_set_par(struct fb_info *info)
498 else 498 else
499 par->video |= PM3VideoControl_LINE_DOUBLE_OFF; 499 par->video |= PM3VideoControl_LINE_DOUBLE_OFF;
500 500
501 if (info->var.activate == FB_ACTIVATE_NOW) 501 if ((info->var.activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW)
502 par->video |= PM3VideoControl_ENABLE; 502 par->video |= PM3VideoControl_ENABLE;
503 else { 503 else {
504 par->video |= PM3VideoControl_DISABLE; 504 par->video |= PM3VideoControl_DISABLE;