Skip to content

Commit

Permalink
pm3fb: switching between X and fb fix
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Krzysztof Helt authored and Linus Torvalds committed Jun 1, 2007
1 parent 27390bc commit 0bd327e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/video/pm3fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 0bd327e

Please sign in to comment.