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 <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Antonino A. Daplas authored and Linus Torvalds committed 2007-07-31 15:39:37 -07:00
1 parent bb029c67e4
commit c81f717cb9
1 file changed
+2 -2
+2 -2
View File
@@ -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) {