From e9e9b850ad5fa30e52586e1b2900f9f98ebe2b77 Mon Sep 17 00:00:00 2001
From: Jasper Spaans <jasper@vs19.net>
Date: Thu, 24 Nov 2005 16:53:36 +0100
Subject: [PATCH] --- yaml --- r: 14682 b: refs/heads/master c:
 6d9885a8ce45cd9b7d36517ee823a480eaf95c02 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/video/fbmem.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c1da243e7f9d..a80274dcba1c 100644
--- 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
index 9f180096c896..6240aedb4154 100644
--- 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;
 	}