1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 45f38390605b..08c292d9c401 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -418,7 +418,8 @@ int fb_prepare_logo(struct fb_info *info, int rotate)
 
         memset(&fb_logo, 0, sizeof(struct logo_data));
 
-        if (info->flags & FBINFO_MISC_TILEBLITTING)
+        if (info->flags & FBINFO_MISC_TILEBLITTING ||
+            info->flags & FBINFO_MODULE)
                 return 0;
 
         if (info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
@@ -483,7 +484,8 @@ int fb_show_logo(struct fb_info *info, int rotate)
         struct fb_image image;
 
         /* Return if the frame buffer is not mapped or suspended */
-        if (fb_logo.logo == NULL || info->state != FBINFO_STATE_RUNNING)
+        if (fb_logo.logo == NULL || info->state != FBINFO_STATE_RUNNING ||
+            info->flags & FBINFO_MODULE)
                 return 0;
 
         image.depth = 8;