From b5c8f32cc270a1f3070c49840b7795e8298aeb60 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 25 Nov 2005 09:33:53 -0800 Subject: [PATCH] --- yaml --- r: 14691 b: refs/heads/master c: 4ad5bd25683ae3a913efb7d5afb7ddf2b2ef09db h: refs/heads/master i: 14689: bf7dfa9fa5def87ae163cb25638622cd77f1adfe 14687: 37eaedc31e948d2bbc916a0a22415193c54df612 v: v3 --- [refs] | 2 +- trunk/drivers/video/fbmem.c | 6 +++++- trunk/include/asm-arm/arch-iop3xx/timex.h | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 50880fa2fa98..aa931d216307 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 551c81e2d32c5867fb592091365d8c37e1509dce +refs/heads/master: 4ad5bd25683ae3a913efb7d5afb7ddf2b2ef09db diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c index 9f180096c896..6240aedb4154 100644 --- a/trunk/drivers/video/fbmem.c +++ b/trunk/drivers/video/fbmem.c @@ -452,13 +452,17 @@ int fb_prepare_logo(struct fb_info *info, int rotate) /* Return if no suitable logo was found */ fb_logo.logo = fb_find_logo(depth); + + if (!fb_logo.logo) { + return 0; + } if (rotate == FB_ROTATE_UR || rotate == FB_ROTATE_UD) yres = info->var.yres; else yres = info->var.xres; - if (fb_logo.logo && fb_logo.logo->height > yres) { + if (fb_logo.logo->height > yres) { fb_logo.logo = NULL; return 0; } diff --git a/trunk/include/asm-arm/arch-iop3xx/timex.h b/trunk/include/asm-arm/arch-iop3xx/timex.h index d4187fe9a85a..472badb451c4 100644 --- a/trunk/include/asm-arm/arch-iop3xx/timex.h +++ b/trunk/include/asm-arm/arch-iop3xx/timex.h @@ -4,7 +4,7 @@ * IOP3xx architecture timex specifications */ #include - +#include #if defined(CONFIG_ARCH_IQ80321) || defined(CONFIG_ARCH_IQ31244)