Commit 0bd327ef authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds

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: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarAntonino Daplas <adaplas@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 27390bc3
...@@ -498,7 +498,7 @@ static int pm3fb_set_par(struct fb_info *info) ...@@ -498,7 +498,7 @@ static int pm3fb_set_par(struct fb_info *info)
else else
par->video |= PM3VideoControl_LINE_DOUBLE_OFF; 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; par->video |= PM3VideoControl_ENABLE;
else { else {
par->video |= PM3VideoControl_DISABLE; par->video |= PM3VideoControl_DISABLE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment