1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 3c65b0d67617..756efeb91abc 100644
--- a/drivers/video/fbmem.c
+++ b/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;