summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorJasper Spaans <jasper@vs19.net>2005-11-24 16:53:36 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-24 18:40:34 -0800
commit6d9885a8ce45cd9b7d36517ee823a480eaf95c02 (patch)
treee2579aea1ad0c0896d95afd1a0cc28b9c21c97fb /drivers/video
parent33bc227e4e48ddadcf2eacb381c19df338f0a6c8 (diff)
downloadop-kernel-dev-6d9885a8ce45cd9b7d36517ee823a480eaf95c02.zip
op-kernel-dev-6d9885a8ce45cd9b7d36517ee823a480eaf95c02.tar.gz
[PATCH] fbcon: fix obvious bug in fbcon logo rotation code
This code fixes a tiny problem with the recent fbcon rotation changes: fb_prepare_logo doesn't check the return value of fb_find_logo and that causes a crash for my while booting. Obvious & working & tested fix is here. Signed-off-by: Jasper Spaans <jasper@vs19.net> Acked-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbmem.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 9f18009..6240aed 100644
--- a/drivers/video/fbmem.c
+++ b/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;
}
OpenPOWER on IntegriCloud