Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c81f717cb9e0bd91dc4b98753cb2705ab0fe2801
Commit:     c81f717cb9e0bd91dc4b98753cb2705ab0fe2801
Parent:     bb029c67e430e9ae96476ce7233468c11627c1db
Author:     Antonino A. Daplas <[EMAIL PROTECTED]>
AuthorDate: Tue Jul 31 00:37:36 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue Jul 31 15:39:37 2007 -0700

    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]>
---
 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 a6828d0..96979c3 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) {
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to