diff options
| author | Antonino A. Daplas | 2007-07-31 00:37:36 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2007-07-31 15:39:37 -0700 |
| commit | c81f717cb9e0bd91dc4b98753cb2705ab0fe2801 (patch) | |
| tree | 449fd751060c50355bf416fe0425c382a42ce047 /drivers/video/console/fonts.c | |
| parent | bb029c67e430e9ae96476ce7233468c11627c1db (diff) | |
fbcon: Fix typo and bogus logic in get_default_font
Reported in: Bugzilla Bug 8727
Fix typo and bogus logic in get_default_font(). The bug results in
get_default_font() returning a font that may not be displayed properly by a
framebuffer driver.
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>
Diffstat (limited to 'drivers/video/console/fonts.c')
| -rw-r--r-- | drivers/video/console/fonts.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/console/fonts.c b/drivers/video/console/fonts.c index a6828d0a4c56..96979c377518 100644 --- a/drivers/video/console/fonts.c +++ b/drivers/video/console/fonts.c @@ -133,8 +133,8 @@ const struct font_desc *get_default_font(int xres, int yres, u32 font_w, if ((yres < 400) == (f->height <= 8)) c += 1000; - if (!(font_w & (1 << (f->width - 1))) || - !(font_w & (1 << (f->height - 1)))) + if ((font_w & (1 << (f->width - 1))) && + (font_h & (1 << (f->height - 1)))) c += 1000; if (c > cc) { |