summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Simmons <jsimmons@maxwell.earthlink.net>2002-10-20 20:28:49 -0700
committerJames Simmons <jsimmons@maxwell.earthlink.net>2002-10-20 20:28:49 -0700
commitfb121c4ae6dc61405d00840c0fbea259ca218dcb (patch)
tree1a6454d7289e438188f02e4f248dc66d87daf515
parent1569953aca38691dc3f34936b9db5cb304080b21 (diff)
Cleaned up the console blank handling.
-rw-r--r--drivers/video/console/fbcon.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index e26ca1bfdd7f..96ebb86b0c62 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -302,13 +302,10 @@ void gen_set_disp(int con, struct fb_info *info)
struct display *display = fb_display + con;
if (info->fix.visual == FB_VISUAL_PSEUDOCOLOR ||
- info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
- display->can_soft_blank = info->fbops->fb_blank ? 1 : 0;
+ info->fix.visual == FB_VISUAL_DIRECTCOLOR)
display->dispsw_data = NULL;
- } else {
- display->can_soft_blank = 0;
+ else
display->dispsw_data = info->pseudo_palette;
- }
/*
* If we are setting all the virtual consoles, also set
@@ -323,6 +320,7 @@ void gen_set_disp(int con, struct fb_info *info)
}
*/
+ display->can_soft_blank = info->fbops->fb_blank ? 1 : 0;
#ifdef FBCON_HAS_ACCEL
display->scrollmode = SCROLL_YNOMOVE;
display->dispsw = &fbcon_accel;