diff options
author | Antonino A. Daplas <adaplas@gmail.com> | 2006-06-26 03:26:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 12:58:29 -0400 |
commit | 0c683dbfc017e52e632853b33981be1a49276ba6 (patch) | |
tree | feb766bb827598e2fc5cf0635a1e58308945431a /drivers/video/fbmem.c | |
parent | ae6d3218760f3cc28192de1f7ff594be744495b4 (diff) |
[PATCH] fbdev: Static pseudocolor with depth less than 4 does exist
A static pseudocolor visual with depth less than 4 does exist, so let's not
accidentally upscale the depth with this configuration
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/fbmem.c')
-rw-r--r-- | drivers/video/fbmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 9bb6763d0cb8..2529805ed1c7 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c | |||
@@ -433,7 +433,7 @@ int fb_prepare_logo(struct fb_info *info, int rotate) | |||
433 | depth = info->var.green.length; | 433 | depth = info->var.green.length; |
434 | } | 434 | } |
435 | 435 | ||
436 | if (info->fix.visual == FB_VISUAL_STATIC_PSEUDOCOLOR) { | 436 | if (info->fix.visual == FB_VISUAL_STATIC_PSEUDOCOLOR && depth > 4) { |
437 | /* assume console colormap */ | 437 | /* assume console colormap */ |
438 | depth = 4; | 438 | depth = 4; |
439 | } | 439 | } |