---

yaml --- r: 14682 b: refs/heads/master c: 6d9885a h: refs/heads/master v: v3
git-mirror · Nov 25, 2005 · e9e9b85 · e9e9b85
1 parent 2b2f5ab
commit e9e9b85
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33bc227e4e48ddadcf2eacb381c19df338f0a6c8
+refs/heads/master: 6d9885a8ce45cd9b7d36517ee823a480eaf95c02
diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c
@@ -452,13 +452,17 @@ int fb_prepare_logo(struct fb_info *info, int rotate)
 
 	/* Return if no suitable logo was found */
 	fb_logo.logo = fb_find_logo(depth);
+
+	if (!fb_logo.logo) {
+		return 0;
+	}
 
 	if (rotate == FB_ROTATE_UR || rotate == FB_ROTATE_UD)
 		yres = info->var.yres;
 	else
 		yres = info->var.xres;
 
-	if (fb_logo.logo && fb_logo.logo->height > yres) {
+	if (fb_logo.logo->height > yres) {
 		fb_logo.logo = NULL;
 		return 0;
 	}