Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-2.6-omap-h63xx.git] / drivers / video / console / fonts.c

diff --git a/drivers/video/console/fonts.c b/drivers/video/console/fonts.c
index a6828d0a4c5674d3553fda2e65b1c6fd1f4ddc7f..96979c37751846f9143a218401d0eb6a5ec02182 100644 (file)
--- 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) {