diff options
| author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2007-06-01 00:47:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-01 08:18:30 -0700 |
| commit | 0bd327ef288923f4188050bae295661ed0fbb3fb (patch) | |
| tree | d53ad395a09d1ee7e368dfad8f2d7f1166fda8c5 | |
| parent | 27390bc335ff86d92c3819cc28035fde23d1a9c2 (diff) | |
| download | kernel-crypto-0bd327ef288923f4188050bae295661ed0fbb3fb.tar.gz kernel-crypto-0bd327ef288923f4188050bae295661ed0fbb3fb.tar.xz kernel-crypto-0bd327ef288923f4188050bae295661ed0fbb3fb.zip | |
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>
| -rw-r--r-- | drivers/video/pm3fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c index 616a0c08e30..b52e883f0a5 100644 --- a/drivers/video/pm3fb.c +++ b/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; |