diff options
| author | Antonino Daplas <adaplas@hotpop.com> | 2005-03-30 16:44:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-30 16:44:30 -0800 |
| commit | 520b29528dfa2cc5ac722a720b6824802872dff8 (patch) | |
| tree | 733816a17c2e038f8a47320a2041302c10b3ca6a | |
| parent | a601b347030f3db06944aa2019f687b3275fdae3 (diff) | |
| download | history-520b29528dfa2cc5ac722a720b6824802872dff8.tar.gz | |
[PATCH] pm2fb: X and VT switching crash fix
From: Jim Hague
This is a bug in pm2fb.c exposed by recent changes to fbcon.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/video/pm2fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c index 496624c277c1b2..3fb987883b037f 100644 --- a/drivers/video/pm2fb.c +++ b/drivers/video/pm2fb.c @@ -747,7 +747,7 @@ static int pm2fb_set_par(struct fb_info *info) } if ((info->var.vmode & FB_VMODE_MASK)==FB_VMODE_DOUBLE) video |= PM2F_LINE_DOUBLE; - if (info->var.activate==FB_ACTIVATE_NOW) + if ((info->var.activate & FB_ACTIVATE_MASK)==FB_ACTIVATE_NOW) video |= PM2F_VIDEO_ENABLE; par->video = video; |