|
@@ -452,13 +452,17 @@ int fb_prepare_logo(struct fb_info *info, int rotate)
|
|
|
|
|
|
/* Return if no suitable logo was found */
|
|
/* Return if no suitable logo was found */
|
|
fb_logo.logo = fb_find_logo(depth);
|
|
fb_logo.logo = fb_find_logo(depth);
|
|
|
|
+
|
|
|
|
+ if (!fb_logo.logo) {
|
|
|
|
+ return 0;
|
|
|
|
+ }
|
|
|
|
|
|
if (rotate == FB_ROTATE_UR || rotate == FB_ROTATE_UD)
|
|
if (rotate == FB_ROTATE_UR || rotate == FB_ROTATE_UD)
|
|
yres = info->var.yres;
|
|
yres = info->var.yres;
|
|
else
|
|
else
|
|
yres = info->var.xres;
|
|
yres = info->var.xres;
|
|
|
|
|
|
- if (fb_logo.logo && fb_logo.logo->height > yres) {
|
|
|
|
|
|
+ if (fb_logo.logo->height > yres) {
|
|
fb_logo.logo = NULL;
|
|
fb_logo.logo = NULL;
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|