---

yaml --- r: 126392 b: refs/heads/master c: 4fb6de2 h: refs/heads/master v: v3
git-mirror · Jan 6, 2009 · 22c533f · 22c533f
1 parent e9a5b01
commit 22c533f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;