From 22c533fa7c41922da0962f9b138d805cbaeb5176 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Date: Tue, 6 Jan 2009 14:42:37 -0800
Subject: [PATCH] --- yaml --- r: 126392 b: refs/heads/master c:
 4fb6de2561d5c47f3539a7b412108164d79fbb96 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/video/fbmem.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0e98222ce457..40310cb63a9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c00b1b7d19d335f96aa03ef2e4e71b7fb4fdb056
+refs/heads/master: 4fb6de2561d5c47f3539a7b412108164d79fbb96
diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c
index 3c65b0d67617..756efeb91abc 100644
--- a/trunk/drivers/video/fbmem.c
+++ b/trunk/drivers/video/fbmem.c
@@ -510,6 +510,10 @@ static int fb_prepare_extra_logos(struct fb_info *info, unsigned int height,
 		fb_logo_ex_num = 0;
 
 	for (i = 0; i < fb_logo_ex_num; i++) {
+		if (fb_logo_ex[i].logo->type != fb_logo.logo->type) {
+			fb_logo_ex[i].logo = NULL;
+			continue;
+		}
 		height += fb_logo_ex[i].logo->height;
 		if (height > yres) {
 			height -= fb_logo_ex[i].logo->height;